diff options
author | crupest <crupest@outlook.com> | 2021-09-15 19:23:45 +0800 |
---|---|---|
committer | crupest <crupest@outlook.com> | 2021-09-15 19:23:45 +0800 |
commit | e6dd695fc757b59571f67a278e4d88ad54cd36ae (patch) | |
tree | 0b95ec353d34ecbf82adb717f786bdbd07d9abda /src/osx/graphics/quartz | |
parent | cb981f5a337f3a8fc9d450b891c358c2b8dc29d3 (diff) | |
download | cru-e6dd695fc757b59571f67a278e4d88ad54cd36ae.tar.gz cru-e6dd695fc757b59571f67a278e4d88ad54cd36ae.tar.bz2 cru-e6dd695fc757b59571f67a278e4d88ad54cd36ae.zip |
...
Diffstat (limited to 'src/osx/graphics/quartz')
-rw-r--r-- | src/osx/graphics/quartz/Brush.cpp | 2 | ||||
-rw-r--r-- | src/osx/graphics/quartz/Font.cpp | 2 | ||||
-rw-r--r-- | src/osx/graphics/quartz/Geometry.cpp | 6 | ||||
-rw-r--r-- | src/osx/graphics/quartz/TextLayout.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/osx/graphics/quartz/Brush.cpp b/src/osx/graphics/quartz/Brush.cpp index 6e4893b1..41e9d2c5 100644 --- a/src/osx/graphics/quartz/Brush.cpp +++ b/src/osx/graphics/quartz/Brush.cpp @@ -1,7 +1,7 @@ #include "cru/osx/graphics/quartz/Brush.hpp" namespace cru::platform::graphics::osx::quartz { -QuartzSolidColorBrush::QuartzSolidColorBrush(IGraphFactory* graphics_factory, +QuartzSolidColorBrush::QuartzSolidColorBrush(IGraphicsFactory* graphics_factory, const Color& color) : QuartzBrush(graphics_factory), color_(color) { cg_color_ = diff --git a/src/osx/graphics/quartz/Font.cpp b/src/osx/graphics/quartz/Font.cpp index e6c1dc91..c35f53fa 100644 --- a/src/osx/graphics/quartz/Font.cpp +++ b/src/osx/graphics/quartz/Font.cpp @@ -4,7 +4,7 @@ #include "cru/osx/graphics/quartz/Resource.hpp" namespace cru::platform::graphics::osx::quartz { -OsxCTFont::OsxCTFont(IGraphFactory* graphics_factory, const String& name, +OsxCTFont::OsxCTFont(IGraphicsFactory* graphics_factory, const String& name, float size) : OsxQuartzResource(graphics_factory) { CFStringRef n = Convert(name); diff --git a/src/osx/graphics/quartz/Geometry.cpp b/src/osx/graphics/quartz/Geometry.cpp index 79e6fbb1..4ad9a7f3 100644 --- a/src/osx/graphics/quartz/Geometry.cpp +++ b/src/osx/graphics/quartz/Geometry.cpp @@ -3,7 +3,7 @@ #include <memory> namespace cru::platform::graphics::osx::quartz { -QuartzGeometry::QuartzGeometry(IGraphFactory *graphics_factory, +QuartzGeometry::QuartzGeometry(IGraphicsFactory *graphics_factory, CGPathRef cg_path) : OsxQuartzResource(graphics_factory), cg_path_(cg_path) {} @@ -14,7 +14,7 @@ bool QuartzGeometry::FillContains(const Point &point) { kCGPathFill); } -QuartzGeometryBuilder::QuartzGeometryBuilder(IGraphFactory *graphics_factory) +QuartzGeometryBuilder::QuartzGeometryBuilder(IGraphicsFactory *graphics_factory) : OsxQuartzResource(graphics_factory) { cg_mutable_path_ = CGPathCreateMutable(); } @@ -42,7 +42,7 @@ void QuartzGeometryBuilder::QuadraticBezierTo(const Point &control_point, } std::unique_ptr<IGeometry> QuartzGeometryBuilder::Build() { - return std::make_unique<QuartzGeometry>(GetGraphFactory(), + return std::make_unique<QuartzGeometry>(GetGraphicsFactory(), CGPathCreateCopy(cg_mutable_path_)); } } // namespace cru::platform::graphics::osx::quartz diff --git a/src/osx/graphics/quartz/TextLayout.cpp b/src/osx/graphics/quartz/TextLayout.cpp index 19fbf57c..d6a19264 100644 --- a/src/osx/graphics/quartz/TextLayout.cpp +++ b/src/osx/graphics/quartz/TextLayout.cpp @@ -7,7 +7,7 @@ #include <limits> namespace cru::platform::graphics::osx::quartz { -OsxCTTextLayout::OsxCTTextLayout(IGraphFactory* graphics_factory, +OsxCTTextLayout::OsxCTTextLayout(IGraphicsFactory* graphics_factory, std::shared_ptr<OsxCTFont> font, const String& str) : OsxQuartzResource(graphics_factory), |