diff options
| author | Andrea Azzarone <azzaronea@gmail.com> | 2014-03-17 22:02:28 +0100 |
|---|---|---|
| committer | Andrea Azzarone <azzaronea@gmail.com> | 2014-03-17 22:02:28 +0100 |
| commit | 4ff2f9cfcd05c8681415d0b1b5297280ba6388fc (patch) | |
| tree | 6d9b0a85fb0dc557084b3502a1284923888c3ad5 /plugins/unityshell | |
| parent | 120f4fa0185db4f5339f8a01773013f077d3d307 (diff) | |
| parent | d8d793ea352b10a1d47e6cfab819938fcfe34d2e (diff) | |
Merge lp:~andyrock/unity/onboard-lockscreen.
(bzr r3725.3.1)
Diffstat (limited to 'plugins/unityshell')
| -rw-r--r-- | plugins/unityshell/src/unityshell.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index 7dd6bb267..f500330df 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -2851,8 +2851,9 @@ bool UnityWindow::glPaint(const GLWindowPaintAttrib& attrib, if (uScreen->lockscreen_controller_->IsLocked()) { - if (window->type() != CompWindowTypePopupMenuMask || - !uScreen->lockscreen_controller_->HasOpenMenu()) + if ((window->type() != CompWindowTypePopupMenuMask || + !uScreen->lockscreen_controller_->HasOpenMenu()) && + window->resName() != "onboard") { // For some reasons PAINT_WINDOW_NO_CORE_INSTANCE_MASK doesn't work here // (well, it works too much, as it applies to menus too), so we need |