Merge lp:~brandontschaefer/unity/opening-dash-in-scale-mode-fix into lp:unity

[Brandon Schaefer]

The dash will now open when invoked while in spread/scale mode.

=== Problem ===
When is spread/scale mode you could not activate the dash.

=== Fix ===
Well this was a bit of a hack, as the scale plugin consumes all input, expect for the hacks already in place in unity. So to open the home dash I had to assume while in scale mode that the state CompTermTapped was true to tests for a super key tapping...if that was true then assume was_tap is true so the dash will open. (Otherwise it wont)

=== Tests ===
There are ap test for opening the Home lens/ Command lens/ Other lenses (app,file,music all open the same way)

[Marco Trevisan (Treviño) (3v1n0)]

Works well, tests pass... So, approved! ;)

review: Approve

[Sebastien Bacher (seb128)]

The steps described there work, it doesn't work perfectly with the launcher spread though:
- left click on the nautilus launcher icon
- middle click on the same icon to open a second instance
- left click to trigger the spread view of nautilus instances
- hit the super key

-> nothing happens

- hit super again

-> the spread closes and the dash open

Ideally you would need to only press super once in those cases (it's not a regression and probably not worth blocking the SRU but would be nice to fix for the next round)

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2012-06-15 15:51:40 +0000
+++ dash/DashController.cpp	2012-06-26 18:36:22 +0000
@@ -80,7 +80,7 @@
   window_->ShowWindow(false);
   window_->SetOpacity(0.0f);
   window_->mouse_down_outside_pointer_grab_area.connect(sigc::mem_fun(this, &Controller::OnMouseDownOutsideWindow));
-  
+
   /* FIXME - first time we load our windows there is a race that causes the input window not to actually get input, this side steps that by causing an input window show and hide before we really need it. */
   auto plugin_adapter = PluginAdapter::Default();
   plugin_adapter->saveInputFocus ();
@@ -337,6 +337,9 @@
   std::string lens_id = view_->GetIdForShortcutActivation(std::string(key_string));
   if (lens_id != "")
   {
+    if (PluginAdapter::Default()->IsScaleActive())
+      PluginAdapter::Default()->TerminateScale();
+
     GVariant* args = g_variant_new("(sus)", lens_id.c_str(), dash::GOTO_DASH_URI, "");
     OnActivateRequest(args);
     g_variant_unref(args);
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-06-25 21:37:57 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-06-26 18:36:22 +0000
@@ -131,6 +131,7 @@
   , hud_keypress_time_(0)
   , panel_texture_has_changed_(true)
   , paint_panel_(false)
+  , scale_just_activated_(false)
 {
   Timer timer;
   gfloat version;
@@ -1532,6 +1533,11 @@
     ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
   }
 
+  if (PluginAdapter::Default()->IsScaleActive() && g_strcmp0(plugin, "scale") == 0)
+  {
+    scale_just_activated_ = true;
+  }
+
   screen->handleCompizEvent(plugin, event, option);
 }
 
@@ -1579,6 +1585,18 @@
   LOG_DEBUG(logger) << "Super released: " << (was_tap ? "tapped" : "released");
   int when = options[7].value().i();  // XEvent time in millisec
 
+  // hack...if the scale just wasn't activated AND the 'when' time is within time to start the
+  // dash then assume was_tap is also true, since the ScalePlugin doesn't accept that state...
+  if (PluginAdapter::Default()->IsScaleActive() && !scale_just_activated_ && launcher_controller_->AboutToShowDash(true, when))
+  {
+    PluginAdapter::Default()->TerminateScale();
+    was_tap = true;
+  }
+  else if (scale_just_activated_)
+  {
+    scale_just_activated_ = false;
+  }
+
   if (hud_controller_->IsVisible() && launcher_controller_->AboutToShowDash(was_tap, when))
     hud_controller_->HideHud();
 
@@ -1635,6 +1653,12 @@
   {
     hud_controller_->HideHud();
   }
+
+  if (PluginAdapter::Default()->IsScaleActive())
+  {
+    PluginAdapter::Default()->TerminateScale();
+  }
+
   ubus_manager_.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
                             g_variant_new("(sus)", "commands.lens", 0, ""));
 }
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-06-23 01:54:48 +0000
+++ plugins/unityshell/src/unityshell.h	2012-06-26 18:36:22 +0000
@@ -311,6 +311,8 @@
   bool paint_panel_;
   nux::ObjectPtr<nux::IOpenGLBaseTexture> panel_texture_;
 
+  bool scale_just_activated_;
+
 #ifndef USE_MODERN_COMPIZ_GL
   ScreenEffectFramebufferObject::GLXGetProcAddressProc glXGetProcAddressP;
 #endif
 
=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2012-06-19 12:53:17 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2012-06-26 18:36:22 +0000
@@ -70,6 +70,30 @@
         self.assertThat(self.window_manager.scale_active, Eventually(Equals(True)))
         self.assertThat(self.dash.visible, Eventually(Equals(False)))
 
+    def test_dash_opens_when_in_spread(self):
+        """This test shows the dash opens when in spread mode."""
+        self.keybinding("spread/start")
+        self.assertThat(self.window_manager.scale_active, Eventually(Equals(True)))
+
+        self.dash.ensure_visible()
+        self.assertThat(self.dash.visible, Eventually(Equals(True)))
+
+    def test_command_lens_opens_when_in_spread(self):
+        """This test shows the command lens opens when in spread mode."""
+        self.keybinding("spread/start")
+        self.assertThat(self.window_manager.scale_active, Eventually(Equals(True)))
+
+        self.dash.reveal_command_lens()
+        self.assertThat(self.dash.active_lens, Eventually(Equals('commands.lens')))
+
+    def test_lens_opens_when_in_spread(self):
+        """This test shows that any lens opens when in spread mode."""
+        self.keybinding("spread/start")
+        self.assertThat(self.window_manager.scale_active, Eventually(Equals(True)))
+
+        self.dash.reveal_application_lens()
+        self.assertThat(self.dash.active_lens, Eventually(Equals('applications.lens')))
+
 
 class DashSearchInputTests(DashTestCase):
     """Test features involving input to the dash search"""
@@ -514,7 +538,7 @@
         self.mouse.move(self.dash.view.x + self.dash.view.width / 2,
                         category.header_y + category.header_height / 2)
 
-        self.mouse.click() 
+        self.mouse.click()
         self.assertThat(category.is_expanded, Eventually(Equals(not is_expanded)))
 
         self.mouse.click()