Unity

Merge lp:~azzar1/unity/lp-1413773 into lp:unity

  1. lp-1413773
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Stephen M. Webb
Approved revision: no longer in the source branch.
Merged at revision: 3912
Proposed branch: lp:~azzar1/unity/lp-1413773
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/unityshell/src/unityshell.cpp (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/lp-1413773
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+247359@code.launchpad.net

Commit message

Make sure dragged icons are not rendered behind the dash.

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

Please note that nux::GetGraphicsDisplay()->PointerIsGrabbed() is fast, does not require xlib calls.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3910
http://jenkins.qa.ubuntu.com/job/unity-ci/1142/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/29

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

review: Approve (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) wrote :

OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2015-01-15 15:02:59 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2015-01-22 22:38:44 +0000
4@@ -957,7 +957,7 @@
5 {
6 return !allowWindowPaint ||
7 lockscreen_controller_->IsLocked() ||
8- dash_controller_->IsVisible() ||
9+ (dash_controller_->IsVisible() && !nux::GetGraphicsDisplay()->PointerIsGrabbed()) ||
10 hud_controller_->IsVisible() ||
11 session_controller_->Visible() ||
12 ((switcher_controller_->Visible() ||