Merge lp:~townsend/unity/fix-keynav-bfb-quicklist into lp:unity

[Christopher Townsend]

Add new signal to tell the Launcher to terminate keynav mode and use that signal when a BFB quicklist item is chosen.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3946
http://jenkins.qa.ubuntu.com/job/unity-ci/1185/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/72

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1185/rebuild

review: Approve (continuous-integration)

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

See comments please

review: Needs Fixing

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

On a second thought, we might also get rid of UBus here (as being async, it might not always work as we'd love), and, if (IsInKeyNavMode()) emit a new launcher signal (key_nav_terminate_request) in Launcher::MouseDownLogic, that the LauncherController connects to...

What you think?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3947
http://jenkins.qa.ubuntu.com/job/unity-ci/1187/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/74

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1187/rebuild

review: Approve (continuous-integration)

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

I'd stop the keynav only if the mouse event happens over an icon, not in the whole launcher (so we respect the same we were trying to do before)

[Christopher Townsend (townsend)]

Hey Marco,

Should be fixed now. I meant to move that inside the "if (launcher_icon)" block before pushing my last commit. Thanks for catching that:)

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

Cool!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3948
http://jenkins.qa.ubuntu.com/job/unity-ci/1188/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/75

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1188/rebuild

review: Approve (continuous-integration)

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2015-03-30 15:48:13 +0000
+++ launcher/Launcher.cpp	2015-04-16 12:19:16 +0000
@@ -2364,6 +2364,11 @@
 
   if (launcher_icon)
   {
+    if (IsInKeyNavMode())
+    {
+      key_nav_terminate_request.emit();
+    }
+
     icon_mouse_down_ = launcher_icon;
     // if MouseUp after the time ended -> it's an icon drag, otherwise, it's starting an app
     auto cb_func = sigc::bind(sigc::mem_fun(this, &Launcher::StartIconDragTimeout), x, y);

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2014-12-12 22:33:24 +0000
+++ launcher/Launcher.h	2015-04-16 12:19:16 +0000
@@ -144,6 +144,7 @@
   sigc::signal<void> selection_change;
   sigc::signal<void> hidden_changed;
   sigc::signal<void> sc_launcher_icon_animation;
+  sigc::signal<void> key_nav_terminate_request;
 
   virtual bool InspectKeyEvent(unsigned int eventType,
                                unsigned int keysym,

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2015-03-20 16:23:04 +0000
+++ launcher/LauncherController.cpp	2015-04-16 12:19:16 +0000
@@ -1289,6 +1289,10 @@
     pimpl->keyboard_launcher_->key_down.connect(sigc::mem_fun(pimpl.get(), &Controller::Impl::ReceiveLauncherKeyPress));
   pimpl->launcher_event_outside_connection_ =
     pimpl->keyboard_launcher_->mouse_down_outside_pointer_grab_area.connect(sigc::mem_fun(pimpl.get(), &Controller::Impl::ReceiveMouseDownOutsideArea));
+  pimpl->launcher_key_nav_terminate_ =
+    pimpl->keyboard_launcher_->key_nav_terminate_request.connect([this] {
+       KeyNavTerminate(false);
+    });
 }
 
 void Controller::KeyNavActivate()
@@ -1369,6 +1373,7 @@
     pimpl->keyboard_launcher_->UnGrabKeyboard();
     pimpl->launcher_key_press_connection_->disconnect();
     pimpl->launcher_event_outside_connection_->disconnect();
+    pimpl->launcher_key_nav_terminate_->disconnect();
     pimpl->launcher_grabbed = false;
     pimpl->ubus.SendMessage(UBUS_LAUNCHER_END_KEY_NAV,
                             glib::Variant(pimpl->keynav_restore_window_));

=== modified file 'launcher/LauncherControllerPrivate.h'
--- launcher/LauncherControllerPrivate.h	2014-02-27 05:30:25 +0000
+++ launcher/LauncherControllerPrivate.h	2015-04-16 12:19:16 +0000
@@ -149,6 +149,7 @@
 
   connection::Wrapper launcher_key_press_connection_;
   connection::Wrapper launcher_event_outside_connection_;
+  connection::Wrapper launcher_key_nav_terminate_; 
   connection::Wrapper average_color_connection_;
 };