Fix pango font rendering.

3 files changed, 6 insertions, 2 deletions

diff --git a/src/platform/graphics/cairo/CairoPainter.cpp b/src/platform/graphics/cairo/CairoPainter.cpp
index b9ab50c4..8dd214cc 100644
--- a/src/platform/graphics/cairo/CairoPainter.cpp
+++ b/src/platform/graphics/cairo/CairoPainter.cpp
@@ -186,6 +186,8 @@ void CairoPainter::DrawText(const Point& offset, ITextLayout* text_layout,
 
   cairo_save(cairo_);
   cairo_set_source(cairo_, cairo_pattern);
+  cairo_move_to(cairo_, offset.x, offset.y);
+  pango_cairo_update_layout(cairo_, pango_text_layout->GetPangoLayout());
   pango_cairo_show_layout(cairo_, pango_text_layout->GetPangoLayout());
   cairo_restore(cairo_);
 }
diff --git a/src/platform/graphics/cairo/PangoFont.cpp b/src/platform/graphics/cairo/PangoFont.cpp
index 0de17add..d5c1ad0b 100644
--- a/src/platform/graphics/cairo/PangoFont.cpp
+++ b/src/platform/graphics/cairo/PangoFont.cpp
@@ -10,7 +10,7 @@ PangoFont::PangoFont(CairoGraphicsFactory* factory, String font_family,
   auto font_family_str = font_family_.ToUtf8();
   pango_font_description_set_family(pango_font_description_,
                                     font_family_str.c_str());
-  pango_font_description_set_size(pango_font_description_, font_size);
+  pango_font_description_set_size(pango_font_description_, font_size * PANGO_SCALE);
 }
 
 PangoFont::~PangoFont() {
diff --git a/src/platform/graphics/cairo/PangoTextLayout.cpp b/src/platform/graphics/cairo/PangoTextLayout.cpp
index 1033ce9e..234c4154 100644
--- a/src/platform/graphics/cairo/PangoTextLayout.cpp
+++ b/src/platform/graphics/cairo/PangoTextLayout.cpp
@@ -6,13 +6,15 @@
 #include "cru/platform/graphics/cairo/CairoGraphicsFactory.h"
 #include "cru/platform/graphics/cairo/PangoFont.h"
 
+#include <pango/pangocairo.h>
+
 namespace cru::platform::graphics::cairo {
 PangoTextLayout::PangoTextLayout(CairoGraphicsFactory* factory,
                                  std::shared_ptr<IFont> font)
     : CairoResource(factory) {
   Expects(font);
   font_ = CheckPlatform<PangoFont>(font, GetPlatformId());
-  pango_layout_ = pango_layout_new(factory->GetDefaultPangoContext());
+  pango_layout_ = pango_cairo_create_layout(factory->GetDefaultCairo());
   pango_layout_set_font_description(pango_layout_,
                                     font_->GetPangoFontDescription());
 };