Merge lp:~azzar1/unity/fix-830801 into lp:unity

[Andrea Azzarone]

Fix the switcher so it displays the full title of apps in Chinese

== Problem ==
App Switcher (Alt+Tab) doesn't display the full title of apps in Chinese

== Fix ==
Use std::ceil to avoid this problem.

== Test ==
StaticCairoText needs a huge refactor to support unit-tests. I can add a unit-test without slowing down the code using an #ifdef TESTS_ENABLED but I don't like it too much.

[Sam Spilsbury (smspillaz)]

> StaticCairoText needs a huge refactor to support unit-tests. I can add a unit-test without slowing down the code using > an #ifdef TESTS_ENABLED but I don't like it too much.

I don't think "huge refactor" is right here.

Probably makes more sense to split StaticCairoText into an mvc type thing, and make the view an interface so that you can mock it out in the tests.

The only other thing I can think of is the requirement for GdkScreen * to get font settings since it reads them from x propeties, but I am pretty sure this can be mocked out.

Not going to block it on this though.

[Tim Penhey (thumper)]

Can you explain how to test this even with a manual test?

review: Needs Information

[Andrea Azzarone (azzar1)]

> Can you explain how to test this even with a manual test?

Done.

[Tim Penhey (thumper)]

review: Approve

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity failed due to conflicts:

text conflict in manual-tests/Switcher.txt

=== modified file 'manual-tests/Switcher.txt'
--- manual-tests/Switcher.txt	2012-04-13 05:01:57 +0000
+++ manual-tests/Switcher.txt	2012-04-18 07:44:19 +0000
@@ -38,3 +38,21 @@
   of the panel should change inline with changes in alt-tab focus.
   Also the menus shouldn't ever show. Even if the mouse has been left over
   the panel when starting the Alt+Tab.
+
+Full app title in Chinese
+-------------------------
+This test ensures that the App Switcher (Alt+Tab) displays the full title
+of apps in Chinese.
+
+Setup:
+#. Install gnome-tweak-tool and run it.
+#. Make sure you have the default font scaling factor (1.0).
+
+Action:
+#. Run:
+   python -c 'from gi.repository import Gtk;win=Gtk.Window(title="显示桌面");win.connect("destroy", Gtk.main_quit);win.show_all();Gtk.main();'
+#. Press Alt+Tab.
+#. Continue to press Tab to select the newly created window.
+
+Outcome
+  The title of the newly created window should be "显示桌面" and *not* "显示桌...".

=== modified file 'plugins/unityshell/src/StaticCairoText.cpp'
--- plugins/unityshell/src/StaticCairoText.cpp	2012-04-10 23:51:34 +0000
+++ plugins/unityshell/src/StaticCairoText.cpp	2012-04-18 07:44:19 +0000
@@ -377,11 +377,11 @@
 
   // logRect has some issues using italic style
   if (inkRect.x + inkRect.width > logRect.x + logRect.width)
-    width = (inkRect.x + inkRect.width - logRect.x) /PANGO_SCALE;
+    width = std::ceil(static_cast<float>(inkRect.x + inkRect.width - logRect.x) / PANGO_SCALE);
   else
-    width  = logRect.width / PANGO_SCALE;
+    width  = std::ceil(static_cast<float>(logRect.width) / PANGO_SCALE);
 
-  height = logRect.height / PANGO_SCALE;
+  height = std::ceil(static_cast<float>(logRect.height) / PANGO_SCALE);
   _cached_extent_height = height;
   _cached_extent_width = width;
   _baseline = pango_layout_get_baseline(layout) / PANGO_SCALE;