Merge lp:~aacid/unity/launcher_selection_changed_fix_1067358_for_6.0 into lp:unity/6.0

[Albert Astals Cid]

Update the UBUS_LAUNCHER_SELECTION_CHANGED on UBUS_QUICKLIST_END_KEY_NAV

Update the UBUS_LAUNCHER_SELECTION_CHANGED on UBUS_QUICKLIST_END_KEY_NAV

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

Thanks!

review: Approve

=== modified file 'launcher/AbstractLauncherIcon.h'
--- launcher/AbstractLauncherIcon.h	2012-09-12 19:00:13 +0000
+++ launcher/AbstractLauncherIcon.h	2012-10-17 10:31:28 +0000
@@ -140,6 +140,7 @@
   virtual void SetSortPriority(int priority) = 0;
 
   virtual bool OpenQuicklist(bool select_first_item = false, int monitor = -1) = 0;
+  virtual void CloseQuicklist() = 0;
 
   virtual void        SetCenter(nux::Point3 center, int monitor, nux::Geometry parent_geo) = 0;
 

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-09-20 00:08:23 +0000
+++ launcher/LauncherController.cpp	2012-10-17 10:31:28 +0000
@@ -149,6 +149,13 @@
       parent_->KeyNavGrab();
 
     model_->SetSelection(reactivate_index);
+    AbstractLauncherIcon::Ptr const& selected = model_->Selection();
+
+    if (selected)
+    {
+      ubus.SendMessage(UBUS_LAUNCHER_SELECTION_CHANGED,
+                       g_variant_new_string(selected->tooltip_text().c_str()));
+    }
   });
 
   parent_->AddChild(model_.get());
@@ -1369,12 +1376,7 @@
     case NUX_VK_RIGHT:
     case NUX_KP_RIGHT:
     case XK_Menu:
-      if (model_->Selection()->OpenQuicklist(true, keyboard_launcher_->monitor()))
-      {
-        reactivate_keynav = true;
-        reactivate_index = model_->SelectionIndex();
-        parent_->KeyNavTerminate(false);
-      }
+      OpenQuicklist();
       break;
 
       // <SPACE> (open a new instance)
@@ -1399,6 +1401,16 @@
   }
 }
 
+void Controller::Impl::OpenQuicklist()
+{
+  if (model_->Selection()->OpenQuicklist(true, keyboard_launcher_->monitor()))
+  {
+    reactivate_keynav = true;
+    reactivate_index = model_->SelectionIndex();
+    parent_->KeyNavTerminate(false);
+  }
+}
+
 void Controller::Impl::OnBusAcquired(GDBusConnection* connection, const gchar* name, gpointer user_data)
 {
   GDBusNodeInfo* introspection_data = g_dbus_node_info_new_for_xml(DBUS_INTROSPECTION.c_str(), nullptr);

=== modified file 'launcher/LauncherControllerPrivate.h'
--- launcher/LauncherControllerPrivate.h	2012-09-17 14:57:22 +0000
+++ launcher/LauncherControllerPrivate.h	2012-10-17 10:31:28 +0000
@@ -107,6 +107,8 @@
                                const char* character,
                                unsigned short keyCount);
 
+  void OpenQuicklist();
+
   static void OnBusAcquired(GDBusConnection* connection, const gchar* name, gpointer user_data);
   static void OnDBusMethodCall(GDBusConnection* connection, const gchar* sender, const gchar* object_path,
                                const gchar* interface_name, const gchar* method_name,

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2012-10-01 12:54:43 +0000
+++ launcher/LauncherIcon.cpp	2012-10-17 10:31:28 +0000
@@ -634,6 +634,11 @@
   return true;
 }
 
+void LauncherIcon::CloseQuicklist()
+{
+  _quicklist->HideAndEndQuicklistNav();
+}
+
 void LauncherIcon::RecvMouseDown(int button, int monitor, unsigned long key_flags)
 {
   if (button == 3)

=== modified file 'launcher/LauncherIcon.h'
--- launcher/LauncherIcon.h	2012-09-12 19:00:13 +0000
+++ launcher/LauncherIcon.h	2012-10-17 10:31:28 +0000
@@ -81,6 +81,7 @@
   void ShowTooltip();
 
   bool OpenQuicklist(bool select_first_item = false, int monitor = -1);
+  void CloseQuicklist();
 
   void        SetCenter(nux::Point3 center, int parent_monitor, nux::Geometry parent_geo);
 

=== modified file 'launcher/MockLauncherIcon.h'
--- launcher/MockLauncherIcon.h	2012-09-17 20:22:35 +0000
+++ launcher/MockLauncherIcon.h	2012-10-17 10:31:28 +0000
@@ -130,6 +130,10 @@
     return false;
   }
 
+  void CloseQuicklist()
+  {
+  }
+
   void SetCenter(nux::Point3 center, int monitor, nux::Geometry geo)
   {
     center.x += geo.x;

=== modified file 'launcher/QuicklistView.cpp'
--- launcher/QuicklistView.cpp	2012-10-01 15:12:05 +0000
+++ launcher/QuicklistView.cpp	2012-10-17 10:31:28 +0000
@@ -279,11 +279,7 @@
       // left (close quicklist, go back to laucher key-nav)
     case NUX_VK_LEFT:
     case NUX_KP_LEFT:
-      Hide();
-      // inform Launcher we switch back to Launcher key-nav
-      ubus_server_send_message(ubus_server_get_default(),
-                               UBUS_QUICKLIST_END_KEY_NAV,
-                               NULL);
+      HideAndEndQuicklistNav();
       break;
 
       // esc (close quicklist, exit key-nav)
@@ -407,6 +403,15 @@
   }
 }
 
+void QuicklistView::HideAndEndQuicklistNav()
+{
+  Hide();
+  // inform Launcher we switch back to Launcher key-nav
+  ubus_server_send_message(ubus_server_get_default(),
+                            UBUS_QUICKLIST_END_KEY_NAV,
+                            NULL);
+}
+
 void QuicklistView::Draw(nux::GraphicsEngine& gfxContext, bool forceDraw)
 {
   CairoBaseWindow::Draw(gfxContext, forceDraw);

=== modified file 'launcher/QuicklistView.h'
--- launcher/QuicklistView.h	2012-08-15 02:51:33 +0000
+++ launcher/QuicklistView.h	2012-10-17 10:31:28 +0000
@@ -60,6 +60,7 @@
 
   void Show();
   void Hide();
+  void HideAndEndQuicklistNav();
 
   int GetNumItems();
   QuicklistMenuItem* GetNthItems(int index);

=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2012-10-12 16:34:45 +0000
+++ tests/test_launcher_controller.cpp	2012-10-17 10:31:28 +0000
@@ -32,6 +32,7 @@
 #include "SoftwareCenterLauncherIcon.h"
 #include "PanelStyle.h"
 #include "UnitySettings.h"
+#include "UBusMessages.h"
 #include "test_utils.h"
 #include "test_uscreen_mock.h"
 #include "test_mock_devices.h"
@@ -204,6 +205,14 @@
     lc.multiple_launchers = true;
   }
 
+  void ProcessUBusMessages()
+  {
+    bool expired = false;
+    glib::Idle idle([&] { expired = true; return false; },
+                    glib::Source::Priority::LOW);
+    Utils::WaitUntil(expired);
+  }
+
 protected:
   struct MockLauncherController : Controller
   {
@@ -1498,4 +1507,24 @@
   EXPECT_TRUE(lc.Impl()->expo_icon_->IsVisible());
 }
 
+TEST_F(TestLauncherController, UpdateSelectionChanged)
+{
+  UBusManager manager;
+  std::string last_selection_change;
+  manager.RegisterInterest(UBUS_LAUNCHER_SELECTION_CHANGED, [&] (GVariant *data) { last_selection_change = g_variant_get_string(data, 0); });
+
+  lc.KeyNavGrab();
+  ProcessUBusMessages();
+  ASSERT_EQ(lc.Impl()->model_->Selection()->tooltip_text(), last_selection_change);
+
+  lc.KeyNavNext();
+  ProcessUBusMessages();
+  ASSERT_EQ(lc.Impl()->model_->Selection()->tooltip_text(), last_selection_change);
+
+  lc.Impl()->OpenQuicklist();
+  lc.Impl()->model_->Selection()->CloseQuicklist();
+  ProcessUBusMessages();
+  ASSERT_EQ(lc.Impl()->model_->Selection()->tooltip_text(), last_selection_change);
+}
+
 }