Merge lp:~vanvugt/unity/fix-1065393 into lp:unity

Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: no longer in the source branch.
Merged at revision: 2846
Proposed branch: lp:~vanvugt/unity/fix-1065393
Merge into: lp:unity
Diff against target: 36 lines (+18/-0)
2 files modified
manual-tests/Panel.txt (+14/-0)
plugins/unityshell/src/unityshell.cpp (+4/-0)
To merge this branch: bzr merge lp:~vanvugt/unity/fix-1065393
Reviewer Review Type Date Requested Status
Sam Spilsbury (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+129110@code.launchpad.net

Commit message

Ensure the panel shadow doesn't get drawn if the panel itself is not being
drawn. (LP: #1065393)
.

Description of the change

See commit message.

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manual-tests/Panel.txt'
2--- manual-tests/Panel.txt 2012-10-02 09:07:30 +0000
3+++ manual-tests/Panel.txt 2012-10-11 08:06:20 +0000
4@@ -111,3 +111,17 @@
5 No part of the panel shadow should ever appear on top of the maximized
6 Chrome window.
7
8+
9+Panel shadow fullscreen
10+-----------------------
11+Setup:
12+#. Install Google Chrome or Chromium.
13+
14+Actions:
15+#. Open Chrome and go full screen (F11)
16+#. Trigger window scale: Shift+Alt+Up or Super+W (in Ubuntu)
17+
18+Expected Result:
19+ The panel shadow should not be visible in scale mode, unless the panel
20+ itself is also visible.
21+
22
23=== modified file 'plugins/unityshell/src/unityshell.cpp'
24--- plugins/unityshell/src/unityshell.cpp 2012-10-10 18:10:34 +0000
25+++ plugins/unityshell/src/unityshell.cpp 2012-10-11 08:06:20 +0000
26@@ -570,6 +570,10 @@
27 return;
28
29 CompOutput* output = _last_output;
30+
31+ if (fullscreenRegion.contains(*output))
32+ return;
33+
34 float panel_h = static_cast<float>(panel_style_.panel_height);
35
36 // You have no shadow texture. But how?