2 files changed, 23 insertions, 7 deletions

diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
index d35d51804..f412328b3 100644
--- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
+++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
@@ -43,9 +43,9 @@ private:
 protected:
   cairo_t *dummy_cairo_; // used to measure text width before showing a window
   cairo_t *cairo_;
+  cairo_t *pango_layout_cairo_;
   PangoLayout *pango_layout_;
   int linestyle_;
-  void handle_dummy_cairo(cairo_t *);
 public:
   Fl_Cairo_Graphics_Driver();
   virtual ~Fl_Cairo_Graphics_Driver();
@@ -61,6 +61,7 @@ public:
   int gap_;
   cairo_t *cr() { return cairo_; }
   PangoLayout *pango_layout() {return pango_layout_;}
+  void set_cairo(cairo_t *c, float f = 0);
 
   void check_status(void);
 
diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
index 029a2eb4f..cb7e07c9b 100644
--- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
+++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
@@ -69,6 +69,7 @@ static void draw_image_cb(void *data, int x, int y, int w, uchar *buf) {
 Fl_Cairo_Graphics_Driver::Fl_Cairo_Graphics_Driver() : Fl_Graphics_Driver() {
   cairo_ = NULL;
   pango_layout_ = NULL;
+  pango_layout_cairo_ = NULL;
   dummy_cairo_ = NULL;
   linestyle_ = FL_SOLID;
   clip_ = NULL;
@@ -85,12 +86,22 @@ Fl_Cairo_Graphics_Driver::~Fl_Cairo_Graphics_Driver() {
 const cairo_format_t Fl_Cairo_Graphics_Driver::cairo_format = CAIRO_FORMAT_ARGB32;
 
 
-void Fl_Cairo_Graphics_Driver::handle_dummy_cairo(cairo_t *cr) {
-  pango_cairo_update_layout(cr, pango_layout_); // 1.10
-  cairo_surface_t *surf = cairo_get_target(dummy_cairo_);
-  cairo_destroy(dummy_cairo_);
-  cairo_surface_destroy(surf);
-  dummy_cairo_ = NULL;
+void Fl_Cairo_Graphics_Driver::set_cairo(cairo_t *cr, float s) {
+  if (dummy_cairo_) {
+    g_object_unref(pango_layout_);
+    pango_layout_ = NULL;
+    cairo_surface_t *surf = cairo_get_target(dummy_cairo_);
+    cairo_destroy(dummy_cairo_);
+    cairo_surface_destroy(surf);
+    dummy_cairo_ = NULL;
+ }
+  cairo_ = cr;
+  cairo_restore(cairo_);
+  line_style(0);
+  cairo_save(cairo_);
+  if (s == 0) s = scale();
+  cairo_scale(cairo_, s, s);
+  cairo_translate(cairo_, 0.5, 0.5);
 }
 
 
@@ -1088,9 +1099,13 @@ void Fl_Cairo_Graphics_Driver::font(Fl_Font fnum, Fl_Fontsize s) {
       cairo_ = cairo_create(surf);
     }
     pango_layout_ = pango_cairo_create_layout(cairo_); // 1.10
+    pango_layout_cairo_ = cairo_;
     if (needs_dummy) {
       dummy_cairo_ = cairo_;
     }
+  } else if (pango_layout_cairo_ != cairo_) {
+    pango_cairo_update_layout(cairo_, pango_layout_);
+    pango_layout_cairo_ = cairo_;
   }
   if (s == 0) return;
   if (font() == fnum && size() == s) return;