Merge lp:~brandontschaefer/unity/lp1085045-fix-title-not-updating-6.0 into lp:unity

[Brandon Schaefer]

Panel title is now being set when in KeyNav mode.

=== Problem ===
When going into KeyNav mode through Alt+F1 the panel title was not being updated to reflect the icon name.

The panel_title was being set to the icon name, but after that in Refresh a check if _panel_title == new_title was always returning true. This is because GetCurrentTitle would reutrn the _panel_title if in keynav more or in switcher mode. So _panel_title == _panel_title....

=== Fix ===
Force the panel title to update.

=== Test ===
There is a nice simple AP test for this.

=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2012-11-26 16:09:53 +0000
+++ panel/PanelMenuView.cpp	2012-11-30 23:38:26 +0000
@@ -1576,7 +1576,7 @@
   const gchar *title = g_variant_get_string(data, 0);
   _panel_title = (title ? title : "");
 
-  Refresh();
+  Refresh(true);
   QueueDraw();
 }
 
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-11-27 00:39:39 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-11-30 23:38:26 +0000
@@ -3847,7 +3847,11 @@
         int text_x = win::decoration::ITEMS_PADDING * 2 + win::decoration::CLOSE_SIZE;
         RenderText(context, text_x, 0.0, width - win::decoration::ITEMS_PADDING, height);
         decoration_selected_tex_ = context.pixmap_texture_;
+<<<<<<< TREE
         uScreen->damageRegion(CompRegion(geo.x, geo.y, width, height));
+=======
+        uScreen->damageRegion(CompRegion(scaled_geo.x, scaled_geo.y, width, height));
+>>>>>>> MERGE-SOURCE
       }
       else
       {
 
=== modified file 'tests/autopilot/unity/tests/launcher/test_keynav.py'
--- tests/autopilot/unity/tests/launcher/test_keynav.py	2012-09-13 10:56:42 +0000
+++ tests/autopilot/unity/tests/launcher/test_keynav.py	2012-11-30 23:38:26 +0000
@@ -234,3 +234,8 @@
         self.assertThat(self.dash.visible, Eventually(Equals(True)))
         self.assertThat(self.launcher.key_nav_is_active, Eventually(Equals(False)))
 
+    def test_launcher_keynav_changes_panel(self):
+        """The panel title must change when in key nav mode."""
+
+        self.start_keynav_with_cleanup_cancel()
+        self.assertThat(self.panels.get_active_panel().title, Eventually(Equals("Dash Home")))