Merge lp:~unity-team/unity/unity.fix-750350 into lp:unity

[Mirco Müller]

Width of GetTextExtents() now takes any x- and y-offset into account. Fixes LP: #750350

[Sam Spilsbury (smspillaz)]

Looks good, although if that's an X Y Width Height rect, I'm not sure why dividing x + width by PANGO_SCALE is going to cover all situations though.

review: Approve

=== modified file 'src/PlacesSimpleTile.cpp'
=== modified file 'src/StaticCairoText.cpp'
--- src/StaticCairoText.cpp	2011-04-10 23:58:19 +0000
+++ src/StaticCairoText.cpp	2011-04-11 00:30:19 +0000
@@ -310,7 +310,6 @@
     return;
   }
 
-
   int maxwidth = GetMaximumWidth ();
 
   surface = cairo_image_surface_create (CAIRO_FORMAT_A1, 1, 1);
@@ -337,7 +336,6 @@
   else
     pango_layout_set_alignment (layout, PANGO_ALIGN_RIGHT);
 
-
   pango_layout_set_markup (layout, _text.GetTCharPtr(), -1);
   pango_layout_set_height (layout, _lines);
   pango_layout_set_width (layout, maxwidth * PANGO_SCALE);
@@ -359,8 +357,8 @@
   pango_layout_context_changed (layout);
   pango_layout_get_extents (layout, NULL, &logRect);
 
-  width  = logRect.width / PANGO_SCALE;
-  height = logRect.height / PANGO_SCALE;
+  width  = (logRect.x + logRect.width) / PANGO_SCALE;
+  height = (logRect.y + logRect.height) / PANGO_SCALE;
   _cached_extent_height = height;
   _cached_extent_width = width;
 
@@ -369,7 +367,6 @@
   g_object_unref (layout);
   cairo_destroy (cr);
   cairo_surface_destroy (surface);
-
 }
 
 void StaticCairoText::DrawText (cairo_t*   cr,
@@ -393,7 +390,7 @@
     fontName = g_strdup (_fontstring);
 
   GetTextExtents (fontName, textWidth, textHeight);
-
+    
   cairo_set_font_options (cr, gdk_screen_get_font_options (screen));
   layout = pango_cairo_create_layout (cr);
   desc = pango_font_description_from_string (fontName);
@@ -410,7 +407,6 @@
   else
     pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_NONE);
 
-
   if (_align == NUX_ALIGN_LEFT)
     pango_layout_set_alignment (layout, PANGO_ALIGN_LEFT);
   else if (_align == NUX_ALIGN_CENTRE)
@@ -420,6 +416,7 @@
 
   pango_layout_set_markup (layout, _text.GetTCharPtr(), -1);
   pango_layout_set_width (layout, textWidth * PANGO_SCALE);
+
   pango_layout_set_height (layout, _lines);
   pangoCtx = pango_layout_get_context (layout); // is not ref'ed
   pango_cairo_context_set_font_options (pangoCtx,