summaryrefslogtreecommitdiff
path: root/plugins/unityshell
diff options
authorBrandon Schaefer <brandontschaefer@gmail.com>2014-03-12 18:03:46 -0700
committerBrandon Schaefer <brandontschaefer@gmail.com>2014-03-12 18:03:46 -0700
commit3f3cd55fe8b69fe94e3cac4436a9ebf9124a40a9 (patch)
tree454916f6e9bbfdc8c7ba3603a895ff9bb36872db /plugins/unityshell
parent980ac5d22fdc2683eaf97eb8b679174047e32d0e (diff)
* When we are about to lock the screen hide the dash/hud
Fixes LP: #1291383 (bzr r3707.2.2)
Diffstat (limited to 'plugins/unityshell')
-rw-r--r--plugins/unityshell/src/unityshell.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index e1b4a0b4c..7920aeb96 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -2530,6 +2530,12 @@ bool UnityScreen::LockScreenInitiate(CompAction* action,
CompOption::Vector& options)
{
sources_.AddIdle([this] {
+ if (launcher_controller_->IsOverlayOpen())
+ {
+ dash_controller_->HideDash();
+ hud_controller_->HideHud();
+ }
+
session_controller_->LockScreen();
return false;
});