Merge lp:~thomir-deactivatedaccount/unity/fix-supertab-launcher-icon-saturation into lp:unity

[Thomi Richards]

Force launcher icons to saturate when keynav starts.

Problem:

If the mouse is over the launcher, initiating the launcher switcher with the dash open doesn't saturate the launcher icons.

Solution:

Force saturation of launcher icons when keynav starts in the launcher.

Tests:

There is an autopilot test.

[Jason Smith (jassmith)]

+1

review: Approve

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-03-30 15:09:22 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-04-04 03:38:19 +0000
@@ -2471,6 +2471,7 @@
 {
   _hide_machine->SetQuirk(LauncherHideMachine::KEY_NAV_ACTIVE, true);
   _hover_machine->SetQuirk(LauncherHoverMachine::KEY_NAV_ACTIVE, true);
+  SaturateIcons();
 }
 
 void Launcher::ExitKeyNavMode()

=== modified file 'tests/autopilot/autopilot/tests/test_launcher.py'
--- tests/autopilot/autopilot/tests/test_launcher.py	2012-04-03 00:16:21 +0000
+++ tests/autopilot/autopilot/tests/test_launcher.py	2012-04-04 03:38:19 +0000
@@ -25,11 +25,11 @@
     screen_geometry = ScreenGeometry()
     num_monitors = screen_geometry.get_num_monitors()
 
+    # it doesn't make sense to set only_primary when we're running in a single-monitor setup.
     if num_monitors == 1:
-        monitor_scenarios =  [('Single Monitor', {'launcher_monitor': 0})]
-    else:
-        monitor_scenarios = [('Monitor %d' % (i), {'launcher_monitor': i}) for i in range(num_monitors)]
+        return [('Single Monitor', {'launcher_monitor': 0, 'only_primary': False})]
 
+    monitor_scenarios = [('Monitor %d' % (i), {'launcher_monitor': i}) for i in range(num_monitors)]
     launcher_mode_scenarios = [('launcher_on_primary', {'only_primary': True}),
                                 ('launcher on all', {'only_primary': False})]
     return multiply_scenarios(monitor_scenarios, launcher_mode_scenarios)
@@ -518,6 +518,25 @@
         # The new launcher icon has a 'Waiting to install' tooltip
         self.assertThat(icon.tooltip_text, Equals("Waiting to install"))
 
+    def test_keynav_from_dash_saturates_icons(self):
+        """Starting super+tab switcher from the dash must resaturate launcher icons.
+
+        Tests fix for bug #913569.
+        """
+        bfb = self.launcher.model.get_bfb_icon()
+        self.mouse.move(bfb.center_x, bfb.center_y)
+        self.dash.ensure_visible()
+        sleep(1)
+        # We can't use 'launcher_instance.switcher_start()' since it moves the mouse.
+        self.keybinding_hold_part_then_tap("launcher/switcher")
+        self.addCleanup(self.keybinding_release, "launcher/switcher")
+        self.addCleanup(self.keybinding, "launcher/switcher/exit")
+
+        self.keybinding_tap("launcher/switcher/next")
+        for icon in self.launcher.model.get_launcher_icons():
+            self.assertFalse(icon.desaturated)
+
+
 
 class LauncherRevealTests(ScenariodLauncherTests):
     """Test the launcher reveal bahavior when in autohide mode."""