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

[Christopher Townsend]

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.

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.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Sweet, 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-09 18:14:24 +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