Merge lp:~3v1n0/unity/switcher-app-middle-click into lp:unity

[Marco Trevisan (Treviño)]

SwitcherView: close the mouse-selected application on middle-click

[Andrea Azzarone (azzar1)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4107
http://jenkins.qa.ubuntu.com/job/unity-ci/1433/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/83

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

review: Approve (continuous-integration)

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2016-03-21 15:38:17 +0000
+++ launcher/SwitcherController.cpp	2016-04-25 15:17:48 +0000
@@ -453,10 +453,6 @@
   view_->background_color = WindowManager::Default().average_color();
   view_->monitor = obj_->monitor_;
   view_->hide_request.connect(sigc::mem_fun(this, &Controller::Impl::Hide));
-  view_->switcher_mouse_up.connect([this] (int icon_index, int button) {
-    if (button == 3)
-      InitiateDetail(true);
-  });
 
   view_->switcher_mouse_move.connect([this] (int icon_index) {
     if (icon_index >= 0)

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2016-03-21 15:38:17 +0000
+++ launcher/SwitcherView.cpp	2016-04-25 15:17:48 +0000
@@ -381,8 +381,6 @@
   int detail_icon_index = DetailIconIdexAt(mouse_pos.x, mouse_pos.y);
 
   last_detail_icon_selected_ = detail_icon_index;
-
-  switcher_mouse_down.emit(detail_icon_index, button);
 }
 
 void SwitcherView::HandleMouseDown(int x, int y, int button)
@@ -390,8 +388,6 @@
   int icon_index = IconIndexAt(x,y);
 
   last_icon_selected_ = icon_index;
-
-  switcher_mouse_down.emit(icon_index, button);
 }
 
 void SwitcherView::RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long /*key_flags*/)
@@ -413,8 +409,6 @@
   nux::Point const& mouse_pos = CalculateMouseMonitorOffset(x, y);
   int detail_icon_index = DetailIconIdexAt(mouse_pos.x, mouse_pos.y);
 
-  switcher_mouse_up.emit(detail_icon_index, button);
-
   if (button == 1)
   {
     if (detail_icon_index >= 0 && detail_icon_index == last_detail_icon_selected_)
@@ -437,14 +431,18 @@
 {
   int icon_index = IconIndexAt(x,y);
 
-  switcher_mouse_up.emit(icon_index, button);
-
-  if (button == 1)
+  if (button == 1 || button == 2 || button == 3)
   {
     if (icon_index >= 0 && icon_index == last_icon_selected_)
     {
       model_->Select(icon_index);
-      hide_request.emit(true);
+
+      if (button == 1)
+        hide_request.emit(true);
+      else if (button == 2)
+        switcher_close_current.emit();
+      else if (button == 3)
+        switcher_start_detail.emit();
     }
   }
 }

=== modified file 'launcher/SwitcherView.h'
--- launcher/SwitcherView.h	2015-11-02 18:28:31 +0000
+++ launcher/SwitcherView.h	2016-04-25 15:17:48 +0000
@@ -73,10 +73,6 @@
   int IconIndexAt(int x, int y) const;
   int DetailIconIdexAt(int x, int y) const;
 
-  /* void; int icon_index, int button*/
-  sigc::signal<void, int, int> switcher_mouse_down;
-  sigc::signal<void, int, int> switcher_mouse_up;
-
   /* void; int icon_index */
   sigc::signal<void, int> switcher_mouse_move;
 

=== modified file 'tests/test_switcher_controller.cpp'
--- tests/test_switcher_controller.cpp	2015-11-04 09:42:55 +0000
+++ tests/test_switcher_controller.cpp	2016-04-25 15:17:48 +0000
@@ -278,7 +278,7 @@
   Mock::VerifyAndClearExpectations(mock_window_.GetPointer());
 }
 
-TEST_F(TestSwitcherController, TestRightClickedReceived)
+TEST_F(TestSwitcherController, TestDetailActivationRequest)
 {
   controller_->Show(ShowMode::ALL, SortMode::LAUNCHER_ORDER, icons_);
 
@@ -287,8 +287,7 @@
 
   ASSERT_FALSE(model->detail_selection());
 
-  view->switcher_mouse_up.emit(-1, 3);
-  view->switcher_mouse_down.emit(-1, 3);
+  view->switcher_start_detail.emit();
 
   ASSERT_TRUE(model->detail_selection());
 }