4 files changed, 10 insertions, 21 deletions
diff --git a/launcher/SwitcherController.cpp b/launcher/SwitcherController.cpp
index 5f9c6e3f0..08a00bbbe 100644
--- a/launcher/SwitcherController.cpp
+++ b/launcher/SwitcherController.cpp
@@ -453,10 +453,6 @@ void Controller::Impl::ConstructView()
 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)
diff --git a/launcher/SwitcherView.cpp b/launcher/SwitcherView.cpp
index 302901ba4..e57b7f529 100644
--- a/launcher/SwitcherView.cpp
+++ b/launcher/SwitcherView.cpp
@@ -381,8 +381,6 @@ void SwitcherView::HandleDetailMouseDown(int x, int y, int button)
 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 @@ void SwitcherView::HandleMouseDown(int x, int y, int button)
 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 @@ void SwitcherView::HandleDetailMouseUp(int x, int y, int button)
 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 @@ void SwitcherView::HandleMouseUp(int x, int y, int button)
 {
 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();
 }
 }
 }
diff --git a/launcher/SwitcherView.h b/launcher/SwitcherView.h
index 00a690358..45f123225 100644
--- a/launcher/SwitcherView.h
+++ b/launcher/SwitcherView.h
@@ -73,10 +73,6 @@ public:
 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;
 
diff --git a/tests/test_switcher_controller.cpp b/tests/test_switcher_controller.cpp
index e63a80213..5160f8ba9 100644
--- a/tests/test_switcher_controller.cpp
+++ b/tests/test_switcher_controller.cpp
@@ -278,7 +278,7 @@ TEST_F(TestSwitcherController, ShowHideSwitcherFading)
 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 @@ TEST_F(TestSwitcherController, TestRightClickedReceived)
 
 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());
 }