...

3 files changed, 24 insertions, 2 deletions

diff --git a/include/cru/platform/graph_factory.hpp b/include/cru/platform/graph_factory.hpp
index 312dc0ea..f6122241 100644
--- a/include/cru/platform/graph_factory.hpp
+++ b/include/cru/platform/graph_factory.hpp
@@ -3,6 +3,7 @@
 
 #include "cru/common/ui_base.hpp"
 
+#include <memory>
 #include <string>
 #include <string_view>
 
@@ -15,7 +16,9 @@ struct TextLayout;
 struct GraphFactory : virtual Interface {
   virtual SolidColorBrush* CreateSolidColorBrush(const ui::Color& color) = 0;
   virtual GeometryBuilder* CreateGeometryBuilder() = 0;
-  virtual FontDescriptor* CreateFontDescriptor(const std::wstring_view& font_family) = 0;
-  virtual TextLayout* CreateTextLayout(std::shared_ptr<FontDescriptor> font, std::wstring text) = 0;
+  virtual FontDescriptor* CreateFontDescriptor(
+      const std::wstring_view& font_family, float font_size) = 0;
+  virtual TextLayout* CreateTextLayout(std::shared_ptr<FontDescriptor> font,
+                                       std::wstring text) = 0;
 };
 }  // namespace cru::platform
diff --git a/include/cru/platform/win/win_graph_factory.hpp b/include/cru/platform/win/win_graph_factory.hpp
index b49413e4..ca83be86 100644
--- a/include/cru/platform/win/win_graph_factory.hpp
+++ b/include/cru/platform/win/win_graph_factory.hpp
@@ -17,6 +17,10 @@ class WinGraphFactory : public Object, public virtual GraphFactory {
 
   SolidColorBrush* CreateSolidColorBrush(const ui::Color& color) override;
   GeometryBuilder* CreateGeometryBuilder() override;
+  FontDescriptor* CreateFontDescriptor(const std::wstring_view& font_family,
+                                       float font_size);
+  TextLayout* CreateTextLayout(std::shared_ptr<FontDescriptor> font,
+                               std::wstring text);
 
  private:
   GraphManager* graph_manager_;
diff --git a/src/platform_win/win_graph_factory.cpp b/src/platform_win/win_graph_factory.cpp
index b21c58d5..03031b32 100644
--- a/src/platform_win/win_graph_factory.cpp
+++ b/src/platform_win/win_graph_factory.cpp
@@ -4,9 +4,12 @@
 #include "cru/platform/win/exception.hpp"
 #include "cru/platform/win/graph_manager.hpp"
 #include "cru/platform/win/win_brush.hpp"
+#include "cru/platform/win/win_font.hpp"
 #include "cru/platform/win/win_geometry.hpp"
+#include "cru/platform/win/win_text_layout.hpp"
 
 #include <cassert>
+#include <utility>
 
 namespace cru::platform::win {
 WinGraphFactory::WinGraphFactory(GraphManager* graph_manager) {
@@ -28,4 +31,16 @@ GeometryBuilder* WinGraphFactory::CreateGeometryBuilder() {
       graph_manager_->GetD2D1Factory()->CreatePathGeometry(&geometry));
   return new WinGeometryBuilder(std::move(geometry));
 }
+
+FontDescriptor* WinGraphFactory::CreateFontDescriptor(
+    const std::wstring_view& font_family, float font_size) {
+  return new WinFontDescriptor(graph_manager_, font_family, font_size);
+}
+
+TextLayout* WinGraphFactory::CreateTextLayout(
+    std::shared_ptr<FontDescriptor> font, std::wstring text) {
+  const auto f = std::dynamic_pointer_cast<WinFontDescriptor>(font);
+  assert(f);
+  return new WinTextLayout(graph_manager_, std::move(f), std::move(text));
+}
 }  // namespace cru::platform::win