Merge lp:~townsend/unity/fix-lp1064155-5.0 into lp:unity/5.0

Proposed by Christopher Townsend on 2013-06-12
Status: Merged
Approved by: Brandon Schaefer on 2013-06-12
Approved revision: 2420
Merged at revision: 2420
Proposed branch: lp:~townsend/unity/fix-lp1064155-5.0
Merge into: lp:unity/5.0
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/unityshell/src/unityshell.cpp (+1/-1)
To merge this branch: bzr merge lp:~townsend/unity/fix-lp1064155-5.0
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) 2013-06-12 Approve on 2013-06-12
Review via email: mp+168979@code.launchpad.net

Commit message

Fixes issue where minimizing a full screen window would not draw the Launcher and Panel after minimization. This is a backport of lp:unity revno. 3320.

Description of the change

Note: This is a backport of lp:unity revno. 3320.

= Issue =
Upon minimizing a full screen window, the Launcher and Panel are not visible.

= Fix =
Add logic to check if full screen windows are minimized.

= Test =
This is a visual issue. Reproduce issue by minimizing a full screen window and observe Launcher and Panel is not visible. Apply this merge and observe that minimizing a full screen window will display the Launcher and Panel.

To post a comment you must log in.
Brandon Schaefer (brandontschaefer) wrote :

LGTM

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 2013-04-23 01:58:42 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2013-06-12 15:26:41 +0000
4@@ -2431,7 +2431,7 @@
5 PAINT_WINDOW_TRANSFORMED_MASK |
6 PAINT_WINDOW_NO_CORE_INSTANCE_MASK;
7 if (!(mask & nonOcclusionBits) &&
8- (window->state() & CompWindowStateFullscreenMask))
9+ (window->state() & CompWindowStateFullscreenMask && !window->minimized()))
10 // And I've been advised to test other things, but they don't work:
11 // && (attrib.opacity == OPAQUE)) <-- Doesn't work; Only set in glDraw
12 // && !window->alpha() <-- Doesn't work; Opaque windows often have alpha

Subscribers

People subscribed via source and target branches