Merge lp:~azzar1/unity/lp-1190275 into lp:unity

[Andrea Azzarone]

Fix rendering of italic text in StaticCairoText.

== Problem ==
Bug #1190275: [Regression] Text in search bar is cut at the end of the last letter.

== Fix ==
ink_rect can be bigger of logic_rect for italic text. Seems like a pango issue, but we need to workaround it in unity.

== Test ==
N/A

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3557
http://jenkins.qa.ubuntu.com/job/unity-ci/428/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/317
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/316

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/428/rebuild

review: Approve (continuous-integration)

=== modified file 'unity-shared/StaticCairoText.cpp'
--- unity-shared/StaticCairoText.cpp	2013-05-02 23:07:06 +0000
+++ unity-shared/StaticCairoText.cpp	2013-10-08 18:12:14 +0000
@@ -579,7 +579,18 @@
                                        (float) dpi / (float) PANGO_SCALE);
   }
   pango_layout_context_changed(layout);
-  pango_layout_get_pixel_size(layout, &result.width, &result.height);
+
+  PangoRectangle ink_rect, logic_rect;
+  pango_layout_get_pixel_extents(layout, &ink_rect, &logic_rect);
+
+  result.height = logic_rect.height;
+
+  // See bug https://bugs.launchpad.net/unity/+bug/1190275
+  // "Text in search bar is cut at the end of the last letter"
+  if (ink_rect.width > logic_rect.width)
+    result.width = ink_rect.width;
+  else
+    result.width = logic_rect.width;
 
   if (result.width > parent_->GetMaximumWidth())
   {