From b6db663269201fa14a6a4aa1b9042645a9e8f859 Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 24 May 2019 23:45:58 +0800 Subject: ... --- include/cru/win/graph/d2d_painter.hpp | 48 ------------ include/cru/win/graph/d2d_util.hpp | 108 --------------------------- include/cru/win/graph/graph_manager.hpp | 51 ------------- include/cru/win/graph/util/convert_util.hpp | 108 +++++++++++++++++++++++++++ include/cru/win/graph/win_brush.hpp | 11 ++- include/cru/win/graph/win_font.hpp | 6 +- include/cru/win/graph/win_geometry.hpp | 12 +-- include/cru/win/graph/win_graph_factory.hpp | 53 ++++++++++--- include/cru/win/graph/win_native_factory.hpp | 16 ++++ include/cru/win/graph/win_painter.hpp | 43 +++++++++++ include/cru/win/graph/win_text_layout.hpp | 12 +-- 11 files changed, 229 insertions(+), 239 deletions(-) delete mode 100644 include/cru/win/graph/d2d_painter.hpp delete mode 100644 include/cru/win/graph/d2d_util.hpp delete mode 100644 include/cru/win/graph/graph_manager.hpp create mode 100644 include/cru/win/graph/util/convert_util.hpp create mode 100644 include/cru/win/graph/win_native_factory.hpp create mode 100644 include/cru/win/graph/win_painter.hpp (limited to 'include/cru/win/graph') diff --git a/include/cru/win/graph/d2d_painter.hpp b/include/cru/win/graph/d2d_painter.hpp deleted file mode 100644 index d33dced4..00000000 --- a/include/cru/win/graph/d2d_painter.hpp +++ /dev/null @@ -1,48 +0,0 @@ -#pragma once -#include "../win_pre_config.hpp" - -#include "cru/platform/graph/painter.hpp" - -namespace cru::win::graph { -class GraphManager; - -class D2DPainter : public Object, public virtual platform::graph::Painter { - public: - explicit D2DPainter(ID2D1RenderTarget* render_target); - D2DPainter(const D2DPainter& other) = delete; - D2DPainter(D2DPainter&& other) = delete; - D2DPainter& operator=(const D2DPainter& other) = delete; - D2DPainter& operator=(D2DPainter&& other) = delete; - ~D2DPainter() override = default; - - platform::Matrix GetTransform() override; - void SetTransform(const platform::Matrix& matrix) override; - void Clear(const ui::Color& color) override; - void StrokeRectangle(const ui::Rect& rectangle, platform::graph::Brush* brush, - float width) override; - void FillRectangle(const ui::Rect& rectangle, - platform::graph::Brush* brush) override; - void StrokeGeometry(platform::graph::Geometry* geometry, - platform::graph::Brush* brush, float width) override; - void FillGeometry(platform::graph::Geometry* geometry, - platform::graph::Brush* brush) override; - void DrawText(const ui::Point& offset, - platform::graph::TextLayout* text_layout, - platform::graph::Brush* brush) override; - void EndDraw() override final; - bool IsDisposed() override final { return is_disposed_; } - - void EndDrawAndDeleteThis() { - EndDraw(); - delete this; - } - - protected: - virtual void DoEndDraw() = 0; - - private: - ID2D1RenderTarget* render_target_; - - bool is_disposed_ = false; -}; -} // namespace cru::win::graph diff --git a/include/cru/win/graph/d2d_util.hpp b/include/cru/win/graph/d2d_util.hpp deleted file mode 100644 index 7a2da91f..00000000 --- a/include/cru/win/graph/d2d_util.hpp +++ /dev/null @@ -1,108 +0,0 @@ -#pragma once -#include "../win_pre_config.hpp" - -#include "cru/common/ui_base.hpp" -#include "cru/platform/matrix.hpp" - -namespace cru::win::graph::util { -inline D2D1_MATRIX_3X2_F Convert(const platform::Matrix& matrix) { - D2D1_MATRIX_3X2_F m; - m._11 = matrix.m11; - m._12 = matrix.m12; - m._21 = matrix.m21; - m._22 = matrix.m22; - m._31 = matrix.m31; - m._32 = matrix.m32; - return m; -} - -inline D2D1_COLOR_F Convert(const ui::Color& color) { - return D2D1::ColorF(color.red / 255.0f, color.green / 255.0f, - color.blue / 255.0f, color.alpha / 255.0f); -} - -inline D2D1_POINT_2F Convert(const ui::Point& point) { - return D2D1::Point2F(point.x, point.y); -} - -inline D2D1_RECT_F Convert(const ui::Rect& rect) { - return D2D1::RectF(rect.left, rect.top, rect.left + rect.width, - rect.top + rect.height); -} - -inline D2D1_ROUNDED_RECT Convert(const ui::RoundedRect& rounded_rect) { - return D2D1::RoundedRect(Convert(rounded_rect.rect), rounded_rect.radius_x, - rounded_rect.radius_y); -} - -inline D2D1_ELLIPSE Convert(const ui::Ellipse& ellipse) { - return D2D1::Ellipse(Convert(ellipse.center), ellipse.radius_x, - ellipse.radius_y); -} - -inline platform::Matrix Convert(const D2D1_MATRIX_3X2_F& matrix) { - return platform::Matrix{matrix._11, matrix._12, matrix._21, - matrix._22, matrix._31, matrix._32}; -} - -inline ui::Color Convert(const D2D1_COLOR_F& color) { - auto floor = [](float n) { return static_cast(n + 0.5f); }; - return ui::Color{floor(color.r * 255.0f), floor(color.g * 255.0f), - floor(color.b * 255.0f), floor(color.a * 255.0f)}; -} - -inline ui::Point Convert(const D2D1_POINT_2F& point) { - return ui::Point(point.x, point.y); -} - -inline ui::Rect Convert(const D2D1_RECT_F& rect) { - return ui::Rect(rect.left, rect.top, rect.right - rect.left, - rect.bottom - rect.top); -} - -inline ui::RoundedRect Convert(const D2D1_ROUNDED_RECT& rounded_rect) { - return ui::RoundedRect(Convert(rounded_rect.rect), rounded_rect.radiusX, - rounded_rect.radiusY); -} - -inline ui::Ellipse Convert(const D2D1_ELLIPSE& ellipse) { - return ui::Ellipse(Convert(ellipse.point), ellipse.radiusX, ellipse.radiusY); -} - -inline bool operator==(const D2D1_POINT_2F& left, const D2D1_POINT_2F& right) { - return left.x == right.x && left.y == right.y; -} - -inline bool operator!=(const D2D1_POINT_2F& left, const D2D1_POINT_2F& right) { - return !(left == right); -} - -inline bool operator==(const D2D1_RECT_F& left, const D2D1_RECT_F& right) { - return left.left == right.left && left.top == right.top && - left.right == right.right && left.bottom == right.bottom; -} - -inline bool operator!=(const D2D1_RECT_F& left, const D2D1_RECT_F& right) { - return !(left == right); -} - -inline bool operator==(const D2D1_ROUNDED_RECT& left, - const D2D1_ROUNDED_RECT& right) { - return left.rect == right.rect && left.radiusX == right.radiusX && - left.radiusY == right.radiusY; -} - -inline bool operator!=(const D2D1_ROUNDED_RECT& left, - const D2D1_ROUNDED_RECT& right) { - return !(left == right); -} - -inline bool operator==(const D2D1_ELLIPSE& left, const D2D1_ELLIPSE& right) { - return left.point == right.point && left.radiusX == right.radiusX && - left.radiusY == right.radiusY; -} - -inline bool operator!=(const D2D1_ELLIPSE& left, const D2D1_ELLIPSE& right) { - return !(left == right); -} -} // namespace cru::win::graph::util diff --git a/include/cru/win/graph/graph_manager.hpp b/include/cru/win/graph/graph_manager.hpp deleted file mode 100644 index bf14b802..00000000 --- a/include/cru/win/graph/graph_manager.hpp +++ /dev/null @@ -1,51 +0,0 @@ -#pragma once -#include "../win_pre_config.hpp" - -#include "cru/common/base.hpp" -#include "cru/win/graph/win_graph_factory.hpp" - -#include - -namespace cru::win::graph { -class GraphManager final : public Object { - public: - static GraphManager* GetInstance(); - - public: - GraphManager(); - GraphManager(const GraphManager& other) = delete; - GraphManager(GraphManager&& other) = delete; - GraphManager& operator=(const GraphManager& other) = delete; - GraphManager& operator=(GraphManager&& other) = delete; - ~GraphManager() override = default; - - public: - ID2D1Factory1* GetD2D1Factory() const { return d2d1_factory_.Get(); } - - ID2D1DeviceContext* GetD2D1DeviceContext() const { - return d2d1_device_context_.Get(); - } - - ID3D11Device* GetD3D11Device() const { return d3d11_device_.Get(); } - - IDXGIFactory2* GetDxgiFactory() const { return dxgi_factory_.Get(); } - - IDWriteFactory* GetDWriteFactory() const { return dwrite_factory_.Get(); } - - IDWriteFontCollection* GetSystemFontCollection() const { - return dwrite_system_font_collection_.Get(); - } - - WinGraphFactory* GetGraphFactory() const { return graph_factory_.get(); } - - private: - Microsoft::WRL::ComPtr d3d11_device_; - Microsoft::WRL::ComPtr d2d1_factory_; - Microsoft::WRL::ComPtr d2d1_device_context_; - Microsoft::WRL::ComPtr dxgi_factory_; - Microsoft::WRL::ComPtr dwrite_factory_; - Microsoft::WRL::ComPtr dwrite_system_font_collection_; - - std::unique_ptr graph_factory_; -}; -} // namespace cru::win::graph diff --git a/include/cru/win/graph/util/convert_util.hpp b/include/cru/win/graph/util/convert_util.hpp new file mode 100644 index 00000000..4b5368b1 --- /dev/null +++ b/include/cru/win/graph/util/convert_util.hpp @@ -0,0 +1,108 @@ +#pragma once +#include "../../win_pre_config.hpp" + +#include "cru/common/ui_base.hpp" +#include "cru/platform/matrix.hpp" + +namespace cru::win::graph::util { +inline D2D1_MATRIX_3X2_F Convert(const platform::Matrix& matrix) { + D2D1_MATRIX_3X2_F m; + m._11 = matrix.m11; + m._12 = matrix.m12; + m._21 = matrix.m21; + m._22 = matrix.m22; + m._31 = matrix.m31; + m._32 = matrix.m32; + return m; +} + +inline D2D1_COLOR_F Convert(const ui::Color& color) { + return D2D1::ColorF(color.red / 255.0f, color.green / 255.0f, + color.blue / 255.0f, color.alpha / 255.0f); +} + +inline D2D1_POINT_2F Convert(const ui::Point& point) { + return D2D1::Point2F(point.x, point.y); +} + +inline D2D1_RECT_F Convert(const ui::Rect& rect) { + return D2D1::RectF(rect.left, rect.top, rect.left + rect.width, + rect.top + rect.height); +} + +inline D2D1_ROUNDED_RECT Convert(const ui::RoundedRect& rounded_rect) { + return D2D1::RoundedRect(Convert(rounded_rect.rect), rounded_rect.radius_x, + rounded_rect.radius_y); +} + +inline D2D1_ELLIPSE Convert(const ui::Ellipse& ellipse) { + return D2D1::Ellipse(Convert(ellipse.center), ellipse.radius_x, + ellipse.radius_y); +} + +inline platform::Matrix Convert(const D2D1_MATRIX_3X2_F& matrix) { + return platform::Matrix{matrix._11, matrix._12, matrix._21, + matrix._22, matrix._31, matrix._32}; +} + +inline ui::Color Convert(const D2D1_COLOR_F& color) { + auto floor = [](float n) { return static_cast(n + 0.5f); }; + return ui::Color{floor(color.r * 255.0f), floor(color.g * 255.0f), + floor(color.b * 255.0f), floor(color.a * 255.0f)}; +} + +inline ui::Point Convert(const D2D1_POINT_2F& point) { + return ui::Point(point.x, point.y); +} + +inline ui::Rect Convert(const D2D1_RECT_F& rect) { + return ui::Rect(rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top); +} + +inline ui::RoundedRect Convert(const D2D1_ROUNDED_RECT& rounded_rect) { + return ui::RoundedRect(Convert(rounded_rect.rect), rounded_rect.radiusX, + rounded_rect.radiusY); +} + +inline ui::Ellipse Convert(const D2D1_ELLIPSE& ellipse) { + return ui::Ellipse(Convert(ellipse.point), ellipse.radiusX, ellipse.radiusY); +} + +inline bool operator==(const D2D1_POINT_2F& left, const D2D1_POINT_2F& right) { + return left.x == right.x && left.y == right.y; +} + +inline bool operator!=(const D2D1_POINT_2F& left, const D2D1_POINT_2F& right) { + return !(left == right); +} + +inline bool operator==(const D2D1_RECT_F& left, const D2D1_RECT_F& right) { + return left.left == right.left && left.top == right.top && + left.right == right.right && left.bottom == right.bottom; +} + +inline bool operator!=(const D2D1_RECT_F& left, const D2D1_RECT_F& right) { + return !(left == right); +} + +inline bool operator==(const D2D1_ROUNDED_RECT& left, + const D2D1_ROUNDED_RECT& right) { + return left.rect == right.rect && left.radiusX == right.radiusX && + left.radiusY == right.radiusY; +} + +inline bool operator!=(const D2D1_ROUNDED_RECT& left, + const D2D1_ROUNDED_RECT& right) { + return !(left == right); +} + +inline bool operator==(const D2D1_ELLIPSE& left, const D2D1_ELLIPSE& right) { + return left.point == right.point && left.radiusX == right.radiusX && + left.radiusY == right.radiusY; +} + +inline bool operator!=(const D2D1_ELLIPSE& left, const D2D1_ELLIPSE& right) { + return !(left == right); +} +} // namespace cru::win::graph::util diff --git a/include/cru/win/graph/win_brush.hpp b/include/cru/win/graph/win_brush.hpp index 69cd952d..c81019c0 100644 --- a/include/cru/win/graph/win_brush.hpp +++ b/include/cru/win/graph/win_brush.hpp @@ -4,18 +4,17 @@ #include "cru/platform/graph/brush.hpp" namespace cru::win::graph { -class GraphManager; +struct IWinNativeFactory; -struct WinBrush : virtual platform::graph::Brush { +struct IWinBrush : virtual platform::graph::IBrush { virtual ID2D1Brush* GetD2DBrush() = 0; }; class WinSolidColorBrush : public Object, - public virtual platform::graph::SolidColorBrush, - public virtual WinBrush { + public virtual platform::graph::ISolidColorBrush, + public virtual IWinBrush { public: - explicit WinSolidColorBrush(GraphManager* graph_manager, - const ui::Color& color); + WinSolidColorBrush(IWinNativeFactory* factory, const ui::Color& color); WinSolidColorBrush(const WinSolidColorBrush& other) = delete; WinSolidColorBrush(WinSolidColorBrush&& other) = delete; WinSolidColorBrush& operator=(const WinSolidColorBrush& other) = delete; diff --git a/include/cru/win/graph/win_font.hpp b/include/cru/win/graph/win_font.hpp index 3301e8da..44fa7edd 100644 --- a/include/cru/win/graph/win_font.hpp +++ b/include/cru/win/graph/win_font.hpp @@ -6,12 +6,12 @@ #include namespace cru::win::graph { -class GraphManager; +struct IWinNativeFactory; class WinFontDescriptor : public Object, - public virtual platform::graph::FontDescriptor { + public virtual platform::graph::IFontDescriptor { public: - explicit WinFontDescriptor(GraphManager* graph_manager, + explicit WinFontDescriptor(IWinNativeFactory* factory, const std::wstring_view& font_family, float font_size); WinFontDescriptor(const WinFontDescriptor& other) = delete; diff --git a/include/cru/win/graph/win_geometry.hpp b/include/cru/win/graph/win_geometry.hpp index 005a4384..e312f13c 100644 --- a/include/cru/win/graph/win_geometry.hpp +++ b/include/cru/win/graph/win_geometry.hpp @@ -4,32 +4,32 @@ #include "cru/platform/graph/geometry.hpp" namespace cru::win::graph { -class GraphManager; +struct IWinNativeFactory; class WinGeometryBuilder : public Object, - public virtual platform::graph::GeometryBuilder { + public virtual platform::graph::IGeometryBuilder { public: - explicit WinGeometryBuilder(GraphManager* graph_manger); + explicit WinGeometryBuilder(IWinNativeFactory* factory); WinGeometryBuilder(const WinGeometryBuilder& other) = delete; WinGeometryBuilder(WinGeometryBuilder&& other) = delete; WinGeometryBuilder& operator=(const WinGeometryBuilder& other) = delete; WinGeometryBuilder& operator=(WinGeometryBuilder&& other) = delete; ~WinGeometryBuilder() override; - bool IsValid() override { return geometry_ != nullptr; } void BeginFigure(const ui::Point& point) override; void LineTo(const ui::Point& point) override; void QuadraticBezierTo(const ui::Point& control_point, const ui::Point& end_point) override; void CloseFigure(bool close) override; - platform::graph::Geometry* Build() override; + platform::graph::IGeometry* End() override; + bool IsEnded() const override { return geometry_ != nullptr; } private: Microsoft::WRL::ComPtr geometry_; Microsoft::WRL::ComPtr geometry_sink_; }; -class WinGeometry : public Object, public virtual platform::graph::Geometry { +class WinGeometry : public Object, public virtual platform::graph::IGeometry { public: explicit WinGeometry(Microsoft::WRL::ComPtr geometry); WinGeometry(const WinGeometry& other) = delete; diff --git a/include/cru/win/graph/win_graph_factory.hpp b/include/cru/win/graph/win_graph_factory.hpp index f8a07819..02f1a0fc 100644 --- a/include/cru/win/graph/win_graph_factory.hpp +++ b/include/cru/win/graph/win_graph_factory.hpp @@ -2,29 +2,60 @@ #include "../win_pre_config.hpp" #include "cru/platform/graph/graph_factory.hpp" +#include "win_native_factory.hpp" namespace cru::win::graph { -class GraphManager; - class WinGraphFactory : public Object, - public virtual platform::graph::GraphFactory { + public virtual platform::graph::IGraphFactory, + public virtual IWinNativeFactory { + friend IGraphFactory* ::cru::platform::graph::IGraphFactory::CreateInstance(); + + public: + static WinGraphFactory* GetInstance(); + + private: + explicit WinGraphFactory(); + public: - explicit WinGraphFactory(GraphManager* graph_manager); WinGraphFactory(const WinGraphFactory& other) = delete; WinGraphFactory(WinGraphFactory&& other) = delete; WinGraphFactory& operator=(const WinGraphFactory& other) = delete; WinGraphFactory& operator=(WinGraphFactory&& other) = delete; - ~WinGraphFactory() override = default; + ~WinGraphFactory() override; + + ID2D1Factory1* GetD2D1Factory() const override { return d2d1_factory_.Get(); } + ID2D1DeviceContext* GetD2D1DeviceContext() const override { + return d2d1_device_context_.Get(); + } + ID3D11Device* GetD3D11Device() const override { return d3d11_device_.Get(); } + IDXGIFactory2* GetDxgiFactory() const override { return dxgi_factory_.Get(); } + IDWriteFactory* GetDWriteFactory() const override { + return dwrite_factory_.Get(); + } + IDWriteFontCollection* GetSystemFontCollection() const override { + return dwrite_system_font_collection_.Get(); + } - platform::graph::SolidColorBrush* CreateSolidColorBrush( + platform::graph::ISolidColorBrush* CreateSolidColorBrush( const ui::Color& color) override; - platform::graph::GeometryBuilder* CreateGeometryBuilder() override; - platform::graph::FontDescriptor* CreateFontDescriptor( + platform::graph::IGeometryBuilder* CreateGeometryBuilder() override; + platform::graph::IFontDescriptor* CreateFontDescriptor( const std::wstring_view& font_family, float font_size); - platform::graph::TextLayout* CreateTextLayout( - std::shared_ptr font, std::wstring text); + platform::graph::ITextLayout* CreateTextLayout( + std::shared_ptr font, + std::wstring text); + + bool IsAutoDelete() const override { return auto_delete_; } + void SetAutoDelete(bool value) override { auto_delete_ = value; } private: - GraphManager* graph_manager_; + bool auto_delete_ = false; + + Microsoft::WRL::ComPtr d3d11_device_; + Microsoft::WRL::ComPtr d2d1_factory_; + Microsoft::WRL::ComPtr d2d1_device_context_; + Microsoft::WRL::ComPtr dxgi_factory_; + Microsoft::WRL::ComPtr dwrite_factory_; + Microsoft::WRL::ComPtr dwrite_system_font_collection_; }; } // namespace cru::win::graph diff --git a/include/cru/win/graph/win_native_factory.hpp b/include/cru/win/graph/win_native_factory.hpp new file mode 100644 index 00000000..f5ad033c --- /dev/null +++ b/include/cru/win/graph/win_native_factory.hpp @@ -0,0 +1,16 @@ +#pragma once +#include "../win_pre_config.hpp" + +#include "cru/common/base.hpp" + +namespace cru::win::graph { +// Interface provides access to root d2d resources. +struct IWinNativeFactory : virtual Interface { + virtual ID2D1Factory1* GetD2D1Factory() const = 0; + virtual ID2D1DeviceContext* GetD2D1DeviceContext() const = 0; + virtual ID3D11Device* GetD3D11Device() const = 0; + virtual IDXGIFactory2* GetDxgiFactory() const = 0; + virtual IDWriteFactory* GetDWriteFactory() const = 0; + virtual IDWriteFontCollection* GetSystemFontCollection() const = 0; +}; +} diff --git a/include/cru/win/graph/win_painter.hpp b/include/cru/win/graph/win_painter.hpp new file mode 100644 index 00000000..f218488c --- /dev/null +++ b/include/cru/win/graph/win_painter.hpp @@ -0,0 +1,43 @@ +#pragma once +#include "../win_pre_config.hpp" + +#include "cru/platform/graph/painter.hpp" + +namespace cru::win::graph { +class GraphManager; + +class WinPainter : public Object, public virtual platform::graph::IPainter { + public: + explicit WinPainter(ID2D1RenderTarget* render_target); + WinPainter(const WinPainter& other) = delete; + WinPainter(WinPainter&& other) = delete; + WinPainter& operator=(const WinPainter& other) = delete; + WinPainter& operator=(WinPainter&& other) = delete; + ~WinPainter() override = default; + + platform::Matrix GetTransform() override; + void SetTransform(const platform::Matrix& matrix) override; + void Clear(const ui::Color& color) override; + void StrokeRectangle(const ui::Rect& rectangle, platform::graph::IBrush* brush, + float width) override; + void FillRectangle(const ui::Rect& rectangle, + platform::graph::IBrush* brush) override; + void StrokeGeometry(platform::graph::IGeometry* geometry, + platform::graph::IBrush* brush, float width) override; + void FillGeometry(platform::graph::IGeometry* geometry, + platform::graph::IBrush* brush) override; + void DrawText(const ui::Point& offset, + platform::graph::ITextLayout* text_layout, + platform::graph::IBrush* brush) override; + void End() override final; + bool IsEnded() const override final { return is_draw_ended_; } + + protected: + virtual void DoEndDraw() = 0; + + private: + ID2D1RenderTarget* render_target_; + + bool is_draw_ended_ = false; +}; +} // namespace cru::win::graph diff --git a/include/cru/win/graph/win_text_layout.hpp b/include/cru/win/graph/win_text_layout.hpp index b861fda7..7339eff9 100644 --- a/include/cru/win/graph/win_text_layout.hpp +++ b/include/cru/win/graph/win_text_layout.hpp @@ -6,12 +6,12 @@ #include namespace cru::win::graph { -class GraphManager; +struct IWinNativeFactory; class WinFontDescriptor; -class WinTextLayout : public Object, public virtual platform::graph::TextLayout { +class WinTextLayout : public Object, public virtual platform::graph::ITextLayout { public: - explicit WinTextLayout(GraphManager* graph_manager, + explicit WinTextLayout(IWinNativeFactory* factory, std::shared_ptr font, std::wstring text); WinTextLayout(const WinTextLayout& other) = delete; WinTextLayout(WinTextLayout&& other) = delete; @@ -21,8 +21,8 @@ class WinTextLayout : public Object, public virtual platform::graph::TextLayout std::wstring GetText() override; void SetText(std::wstring new_text) override; - std::shared_ptr GetFont(); - void SetFont(std::shared_ptr font); + std::shared_ptr GetFont(); + void SetFont(std::shared_ptr font); void SetMaxWidth(float max_width) override; void SetMaxHeight(float max_height) override; ui::Rect GetTextBounds() override; @@ -32,7 +32,7 @@ class WinTextLayout : public Object, public virtual platform::graph::TextLayout IDWriteTextLayout* GetDWriteTextLayout() const { return text_layout_.Get(); } private: - GraphManager* graph_manager_; + IWinNativeFactory* factory_; std::wstring text_; std::shared_ptr font_descriptor_; float max_width_ = 0.0f; -- cgit v1.2.3