3 files changed, 47 insertions, 0 deletions

diff --git a/src/platform_win/win_font.cpp b/src/platform_win/win_font.cpp
index e0a309cc..bca70b9f 100644
--- a/src/platform_win/win_font.cpp
+++ b/src/platform_win/win_font.cpp
@@ -18,5 +18,8 @@ WinFontDescriptor::WinFontDescriptor(GraphManager* graph_manager,
       font_family.data(), nullptr, DWRITE_FONT_WEIGHT_NORMAL,
       DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, font_size,
       buffer.data(), &text_format_));
+
+  ThrowIfFailed(text_format_->SetTextAlignment(DWRITE_TEXT_ALIGNMENT_CENTER));
+  ThrowIfFailed(text_format_->SetParagraphAlignment(DWRITE_PARAGRAPH_ALIGNMENT_CENTER));
 }
 }  // namespace cru::platform::win
diff --git a/src/platform_win/win_painter.cpp b/src/platform_win/win_painter.cpp
index 748d5766..b648f97d 100644
--- a/src/platform_win/win_painter.cpp
+++ b/src/platform_win/win_painter.cpp
@@ -6,6 +6,7 @@
 #include "cru/platform/win/win_brush.hpp"
 #include "cru/platform/win/win_geometry.hpp"
 #include "cru/platform/win/win_native_window.hpp"
+#include "cru/platform/win/win_text_layout.hpp"
 #include "cru/platform/win/window_render_target.hpp"
 
 #include <cassert>
@@ -28,15 +29,33 @@ WinPainter::~WinPainter() {
 }
 
 Matrix WinPainter::GetTransform() {
+  assert(!IsDisposed());
   D2D1_MATRIX_3X2_F m;
   render_target_->GetTransform(&m);
   return util::Convert(m);
 }
 
 void WinPainter::SetTransform(const Matrix& matrix) {
+  assert(!IsDisposed());
   render_target_->SetTransform(util::Convert(matrix));
 }
 
+void WinPainter::StrokeRectangle(const ui::Rect& rectangle, Brush* brush,
+                                 float width) {
+  assert(!IsDisposed());
+  const auto b = dynamic_cast<WinBrush*>(brush);
+  assert(b);
+  render_target_->DrawRectangle(util::Convert(rectangle), b->GetD2DBrush(),
+                                width);
+}
+
+void WinPainter::FillRectangle(const ui::Rect& rectangle, Brush* brush) {
+  assert(!IsDisposed());
+  const auto b = dynamic_cast<WinBrush*>(brush);
+  assert(b);
+  render_target_->FillRectangle(util::Convert(rectangle), b->GetD2DBrush());
+}
+
 void WinPainter::StrokeGeometry(Geometry* geometry, Brush* brush, float width) {
   assert(!IsDisposed());
   const auto g = dynamic_cast<WinGeometry*>(geometry);
@@ -57,6 +76,18 @@ void WinPainter::FillGeometry(Geometry* geometry, Brush* brush) {
   render_target_->FillGeometry(g->GetNative(), b->GetD2DBrush());
 }
 
+void WinPainter::DrawText(const ui::Point& offset, TextLayout* text_layout,
+                          Brush* brush) {
+  assert(!IsDisposed());
+  const auto t = dynamic_cast<WinTextLayout*>(text_layout);
+  assert(t);
+  const auto b = dynamic_cast<WinBrush*>(brush);
+  assert(b);
+
+  render_target_->DrawTextLayout(util::Convert(offset),
+                                 t->GetDWriteTextLayout(), b->GetD2DBrush());
+}
+
 void WinPainter::EndDraw() {
   if (!IsDisposed()) {
     ThrowIfFailed(render_target_->EndDraw());
diff --git a/src/platform_win/win_text_layout.cpp b/src/platform_win/win_text_layout.cpp
index 9915b56c..7ae87a80 100644
--- a/src/platform_win/win_text_layout.cpp
+++ b/src/platform_win/win_text_layout.cpp
@@ -30,6 +30,19 @@ void WinTextLayout::SetText(std::wstring new_text) {
       max_width_, max_height_, &text_layout_));
 }
 
+std::shared_ptr<FontDescriptor> WinTextLayout::GetFont() {
+  return font_descriptor_;
+}
+
+void WinTextLayout::SetFont(std::shared_ptr<FontDescriptor> font) {
+  auto f = std::dynamic_pointer_cast<WinFontDescriptor>(font);
+  assert(f);
+  f.swap(font_descriptor_);
+  ThrowIfFailed(graph_manager_->GetDWriteFactory()->CreateTextLayout(
+      text_.c_str(), text_.size(), font_descriptor_->GetDWriteTextFormat(),
+      max_width_, max_height_, &text_layout_));
+}
+
 void WinTextLayout::SetMaxWidth(float max_width) {
   max_width_ = max_width;
   ThrowIfFailed(text_layout_->SetMaxWidth(max_width_));