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

[Christopher Townsend]

Fixes issue where minimizing a full screen window would not draw the Launcher and Panel after minimization.

= 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.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3316
http://jenkins.qa.ubuntu.com/job/unity-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/46

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

review: Approve (continuous-integration)

[Sam Spilsbury (smspillaz)]

Like the compiz merge proposal, I feel like this is probably in the wrong place. The correct approach would be to not add the minimized window to fullscreen_windows_ in the first place in UnityWindow::glPaint rather than checking for a minimized fullscreen window in fullscren_windows_ later and preventing the operation of the occlusion code after that.

[Christopher Townsend (townsend)]

Thanks Sam. I will re-work this some to take your suggestions into account.

[Sam Spilsbury (smspillaz)]

Great, looks good to me :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3317
http://jenkins.qa.ubuntu.com/job/unity-ci/49/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/49

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-04-23 16:59:52 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-05-08 21:58:38 +0000
@@ -2505,7 +2505,7 @@
         uScreen->windows_for_monitor_[monitor] = 1;
 
       if (!(mask & nonOcclusionBits) &&
-          (window->state() & CompWindowStateFullscreenMask) &&
+          (window->state() & CompWindowStateFullscreenMask && !window->minimized()) &&
           uScreen->windows_for_monitor_[monitor] == 1)
           // And I've been advised to test other things, but they don't work:
           // && (attrib.opacity == OPAQUE)) <-- Doesn't work; Only set in glDraw