Merge lp:~brandontschaefer/unity/lp.1167466-fix into lp:unity

[Brandon Schaefer]

If the command lens is open, and we have received an event from compiz to open the command lens, close the dash.

=== Problem ===
If in the Command Lens, Alt+F2 does not close the Command lens.

=== Fix ===
If the command lens is open, and we have received an event from compiz to open the command lens, close the dash.

=== Test ===
AP test

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[Brandon Schaefer (brandontschaefer)]

All dash AP test passed

Ran 79 tests in 585.985s
OK

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2013-03-19 18:47:01 +0000
+++ dash/DashController.cpp	2013-04-10 18:30:30 +0000
@@ -464,6 +464,11 @@
   return visible_;
 }
 
+bool Controller::IsCommandLensOpen() const
+{
+  return visible_ && view_->IsCommandLensOpen();
+}
+
 nux::Geometry Controller::GetInputWindowGeometry()
 {
   EnsureDash();

=== modified file 'dash/DashController.h'
--- dash/DashController.h	2013-03-04 12:57:41 +0000
+++ dash/DashController.h	2013-04-10 18:30:30 +0000
@@ -65,6 +65,7 @@
   void ReFocusKeyInput();
 
   bool IsVisible() const;
+  bool IsCommandLensOpen() const;
   nux::Geometry GetInputWindowGeometry();
 
 protected:

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2013-04-08 20:27:29 +0000
+++ dash/DashView.cpp	2013-04-10 18:30:30 +0000
@@ -188,6 +188,11 @@
   renderer_.y_offset = y;
 }
 
+bool DashView::IsCommandLensOpen() const
+{
+  return (lens_bar_->GetActiveLensId() == "commands.lens");
+}
+
 void DashView::OnUriActivated(ResultView::ActivateType type, std::string const& uri, GVariant* data, std::string const& unique_id) 
 {
   last_activated_uri_ = uri;

=== modified file 'dash/DashView.h'
--- dash/DashView.h	2013-03-14 18:55:36 +0000
+++ dash/DashView.h	2013-04-10 18:30:30 +0000
@@ -69,6 +69,8 @@
   void OnActivateRequest(GVariant* args);
   void SetMonitorOffset(int x, int y);
 
+  bool IsCommandLensOpen() const;
+
   std::string const GetIdForShortcutActivation(std::string const& shortcut) const;
   std::vector<char> GetAllShortcuts();
 

=== modified file 'dash/LensBar.h'
--- dash/LensBar.h	2013-04-05 09:50:39 +0000
+++ dash/LensBar.h	2013-04-10 18:30:30 +0000
@@ -62,6 +62,7 @@
   void ActivateNext();
   void ActivatePrevious();
 
+  std::string GetActiveLensId() const;
   sigc::signal<void, std::string const&> lens_activated;
 
 private:
@@ -81,7 +82,6 @@
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
 
-  std::string GetActiveLensId() const;
   typedef std::unique_ptr<nux::AbstractPaintLayer> LayerPtr;
 
   LensIcons icons_;

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-04-08 23:26:54 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-04-10 18:30:30 +0000
@@ -1839,11 +1839,18 @@
     adapter.TerminateScale();
   }
 
-  ubus_manager_.SendMessage(UBUS_DASH_ABOUT_TO_SHOW, NULL, glib::Source::Priority::HIGH);
+  if (dash_controller_->IsCommandLensOpen())
+  {
+    ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
+  }
+  else
+  {
+    ubus_manager_.SendMessage(UBUS_DASH_ABOUT_TO_SHOW, NULL, glib::Source::Priority::HIGH);
 
-  ubus_manager_.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
-                            g_variant_new("(sus)", "commands.lens", dash::GOTO_DASH_URI, ""),
-                            glib::Source::Priority::LOW);
+    ubus_manager_.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
+                              g_variant_new("(sus)", "commands.lens", dash::GOTO_DASH_URI, ""),
+                              glib::Source::Priority::LOW);
+  }
 }
 
 bool UnityScreen::executeCommand(CompAction* action,

=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2013-04-05 09:50:39 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2013-04-10 18:30:30 +0000
@@ -78,6 +78,14 @@
         self.unity.dash.reveal_command_lens()
         self.assertThat(self.unity.dash.active_lens, Eventually(Equals('commands.lens')))
 
+    def test_command_lens_can_close_itself(self):
+        """We must be able to close the Command lens with Alt+F2"""
+        self.unity.dash.reveal_command_lens()
+        self.assertThat(self.unity.dash.visible, Eventually(Equals(True)))
+
+        self.keybinding("lens_reveal/command")
+        self.assertThat(self.unity.dash.visible, Eventually(Equals(False)))
+
     def test_alt_f4_close_dash(self):
         """Dash must close on alt+F4."""
         self.unity.dash.ensure_visible()