Merge lp:~mc-return/unity/unity.merge-fix1063249 into lp:unity

Proposed by MC Return
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 2833
Proposed branch: lp:~mc-return/unity/unity.merge-fix1063249
Merge into: lp:unity
Diff against target: 34 lines (+15/-1)
2 files modified
manual-tests/WindowManagement.txt (+14/-0)
plugins/unityshell/src/UnityShowdesktopHandler.cpp (+1/-1)
To merge this branch: bzr merge lp:~mc-return/unity/unity.merge-fix1063249
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
jenkins continuous-integration Pending
Review via email: mp+129457@code.launchpad.net

Commit message

Opacity should be 0 if the state is invisible.
Added a manual "Show Desktop" test.

Description of the change

Please see https://bugs.launchpad.net/unity/+bug/1063249.

This fix has already been tested.

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Awesome, confirmed working +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manual-tests/WindowManagement.txt'
2--- manual-tests/WindowManagement.txt 2012-07-25 08:38:07 +0000
3+++ manual-tests/WindowManagement.txt 2012-10-12 16:51:19 +0000
4@@ -68,3 +68,17 @@
5 #. Tap F11 to leave full screen.
6 #. Press Super+S twice to force a full screen redraw.
7
8+
9+Show Desktop fades windows smoothly
10+------------------------------------
11+Tests visual regressions to the show desktop/restore windows behavior.
12+
13+Setup:
14+
15+Action:
16+#. Open several windows.
17+#. Press Super+D to show the desktop.
18+#. Press Super+D again to restore the previous state.
19+
20+Expected Result:
21+ All open windows must fade out and then fade back in smoothly, without any popping or pulsing effect.
22
23=== modified file 'plugins/unityshell/src/UnityShowdesktopHandler.cpp'
24--- plugins/unityshell/src/UnityShowdesktopHandler.cpp 2012-04-23 12:25:44 +0000
25+++ plugins/unityshell/src/UnityShowdesktopHandler.cpp 2012-10-12 16:51:19 +0000
26@@ -168,7 +168,7 @@
27
28 void ShowdesktopHandler::PaintOpacity (unsigned short &opacity)
29 {
30- if (progress_ == 1.0f || progress_ == 0.0f)
31+ if (progress_ == 0.0f)
32 opacity = std::numeric_limits <unsigned short>::max();
33 else
34 opacity *= (1.0f - progress_);