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

Proposed by MC Return on 2012-10-15
Status: Merged
Approved by: Łukasz Zemczak on 2012-10-15
Approved revision: 2777
Merged at revision: 2780
Proposed branch: lp:~mc-return/unity/unity6.0.merge-fix1063249
Merge into: lp:unity/6.0
Diff against target: 35 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/unity6.0.merge-fix1063249
Reviewer Review Type Date Requested Status
Łukasz Zemczak 2012-10-15 Approve on 2012-10-15
Review via email: mp+129632@code.launchpad.net

Commit Message

Fixed fade-in behavior of Unity's showdesktop function. The windows were popping back in, fading out a bit and then fading in. This fix makes them fade back in smoothly.
Also added a manual test.

To post a comment you must log in.
Łukasz Zemczak (sil2100) wrote :

WFM.

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-15 09:41:22 +0000
4@@ -67,4 +67,18 @@
5 #. Tap the Super key again.
6 #. Tap F11 to leave full screen.
7 #. Press Super+S twice to force a full screen redraw.
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
24=== modified file 'plugins/unityshell/src/UnityShowdesktopHandler.cpp'
25--- plugins/unityshell/src/UnityShowdesktopHandler.cpp 2012-04-23 12:25:44 +0000
26+++ plugins/unityshell/src/UnityShowdesktopHandler.cpp 2012-10-15 09:41:22 +0000
27@@ -168,7 +168,7 @@
28
29 void ShowdesktopHandler::PaintOpacity (unsigned short &opacity)
30 {
31- if (progress_ == 1.0f || progress_ == 0.0f)
32+ if (progress_ == 0.0f)
33 opacity = std::numeric_limits <unsigned short>::max();
34 else
35 opacity *= (1.0f - progress_);

Subscribers

People subscribed via source and target branches

to all changes: