diff options
| -rw-r--r-- | dash/DashController.cpp | 4 | ||||
| -rw-r--r-- | hud/HudController.cpp | 1 | ||||
| -rw-r--r-- | plugins/unityshell/src/unityshell.cpp | 8 |
3 files changed, 5 insertions, 8 deletions
diff --git a/dash/DashController.cpp b/dash/DashController.cpp index 0e693c53f..a4bfbc758 100644 --- a/dash/DashController.cpp +++ b/dash/DashController.cpp @@ -105,7 +105,9 @@ Controller::Controller(Controller::WindowCreator const& create_window) } }); - WindowManager::Default().initiate_spread.connect(sigc::mem_fun(this, &Controller::HideDash)); + auto& wm = WindowManager::Default(); + wm.initiate_spread.connect(sigc::mem_fun(this, &Controller::HideDash)); + wm.screen_viewport_switch_started.connect(sigc::mem_fun(this, &Controller::HideDash)); dbus_server_.AddObjects(dbus::INTROSPECTION, dbus::PATH); dbus_server_.GetObjects().front()->SetMethodsCallsHandler([this] (std::string const& method, GVariant*) { diff --git a/hud/HudController.cpp b/hud/HudController.cpp index 58134d4a6..aefe40f63 100644 --- a/hud/HudController.cpp +++ b/hud/HudController.cpp @@ -102,6 +102,7 @@ Controller::Controller(Controller::ViewCreator const& create_view, WindowManager& wm = WindowManager::Default(); wm.screen_ungrabbed.connect(sigc::mem_fun(this, &Controller::OnScreenUngrabbed)); wm.initiate_spread.connect(sigc::mem_fun(this, &Controller::HideHud)); + wm.screen_viewport_switch_started.connect(sigc::mem_fun(this, &Controller::HideHud)); hud_service_.queries_updated.connect(sigc::mem_fun(this, &Controller::OnQueriesFinished)); timeline_animator_.updated.connect(sigc::mem_fun(this, &Controller::OnViewShowHideFrame)); diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index bbc1dd4ea..add6b9236 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -1978,13 +1978,7 @@ void UnityScreen::handleCompizEvent(const char* plugin, { PluginAdapter& adapter = PluginAdapter::Default(); adapter.NotifyCompizEvent(plugin, event, option); - compiz::CompizMinimizedWindowHandler<UnityScreen, UnityWindow>::handleCompizEvent (plugin, event, option); - - if (launcher_controller_->IsOverlayOpen() && g_strcmp0(event, "start_viewport_switch") == 0) - { - ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST); - } - + compiz::CompizMinimizedWindowHandler<UnityScreen, UnityWindow>::handleCompizEvent(plugin, event, option); screen->handleCompizEvent(plugin, event, option); } |