2 files changed, 9 insertions, 3 deletions
diff --git a/include/cru/platform/graphics/cairo/CairoGraphicsFactory.h b/include/cru/platform/graphics/cairo/CairoGraphicsFactory.h
index 280ea15f..6932f10a 100644
--- a/include/cru/platform/graphics/cairo/CairoGraphicsFactory.h
+++ b/include/cru/platform/graphics/cairo/CairoGraphicsFactory.h
@@ -17,11 +17,11 @@ class CRU_PLATFORM_GRAPHICS_CAIRO_API CairoGraphicsFactory
  public:
   cairo_surface_t* GetDefaultCairoSurface() { return default_cairo_surface_; }
   cairo_t* GetDefaultCairo() { return default_cairo_; }
+  PangoContext* GetDefaultPangoContext() { return default_pango_context_; }
 
  private:
   cairo_surface_t* default_cairo_surface_;
   cairo_t* default_cairo_;
-
-  PangoContext* pango_context_;
+  PangoContext* default_pango_context_;
 };
 }  // namespace cru::platform::graphics::cairo
diff --git a/include/cru/platform/graphics/cairo/PangoTextLayout.h b/include/cru/platform/graphics/cairo/PangoTextLayout.h
index 992e5b4a..3f3a67b5 100644
--- a/include/cru/platform/graphics/cairo/PangoTextLayout.h
+++ b/include/cru/platform/graphics/cairo/PangoTextLayout.h
@@ -1,11 +1,14 @@
 #pragma once
 #include "../TextLayout.h"
 #include "CairoResource.h"
+#include "PangoFont.h"
+
+#include <pango/pango.h>
 
 namespace cru::platform::graphics::cairo {
 class PangoTextLayout : public CairoResource, public virtual ITextLayout {
  public:
-  explicit PangoTextLayout(CairoGraphicsFactory* factory);
+  PangoTextLayout(CairoGraphicsFactory* factory, std::shared_ptr<IFont> font);
 
   ~PangoTextLayout() override;
 
@@ -34,5 +37,8 @@ class PangoTextLayout : public CairoResource, public virtual ITextLayout {
 
  private:
   String text_;
+  std::shared_ptr<PangoFont> font_;
+
+  PangoLayout* pango_layout_;
 };
 }  // namespace cru::platform::graphics::cairo