Merge lp:~azzar1/unity/fix-1024113-2.0 into lp:unity

Proposed by Andrea Azzarone on 2012-08-06
Status: Merged
Approved by: Tim Penhey on 2012-08-08
Approved revision: 2541
Merged at revision: 2547
Proposed branch: lp:~azzar1/unity/fix-1024113-2.0
Merge into: lp:unity
Diff against target: 38 lines (+15/-1)
2 files modified
launcher/Launcher.cpp (+4/-1)
manual-tests/Launcher.txt (+11/-0)
To merge this branch: bzr merge lp:~azzar1/unity/fix-1024113-2.0
Reviewer Review Type Date Requested Status
Tim Penhey (community) 2012-08-06 Approve on 2012-08-08
Review via email: mp+118314@code.launchpad.net

Commit message

Fix flickers when changing launcher icon size.

Description of the change

== Problem ==
Screen flickers when changing launcher icon size.

== Fix ==
Use the strut-hack just the first time.

== Test ==
Manual test.

To post a comment you must log in.
Tim Penhey (thumper) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/Launcher.cpp'
2--- launcher/Launcher.cpp 2012-08-03 13:43:50 +0000
3+++ launcher/Launcher.cpp 2012-08-06 08:10:42 +0000
4@@ -1473,11 +1473,14 @@
5 }
6 else
7 {
8+ static bool first_time = true;
9+
10 _parent->EnableInputWindow(true, launcher::window_title, false, false);
11
12- if (!sources_.GetSource(STRUT_HACK_TIMEOUT))
13+ if (first_time && !sources_.GetSource(STRUT_HACK_TIMEOUT))
14 {
15 sources_.AddTimeout(1000, sigc::mem_fun(this, &Launcher::StrutHack), STRUT_HACK_TIMEOUT);
16+ first_time = false;
17 }
18
19 _parent->InputWindowEnableStruts(true);
20
21=== modified file 'manual-tests/Launcher.txt'
22--- manual-tests/Launcher.txt 2012-08-03 13:43:50 +0000
23+++ manual-tests/Launcher.txt 2012-08-06 08:10:42 +0000
24@@ -679,3 +679,14 @@
25 * No icon flickers near the top panel.
26 * See https://bugs.launchpad.net/unity/+bug/980942/+attachment/3059914/+files/launcher-accordion-effect-tooltip-bug.ogv.
27
28+
29+No flickering when resizing the launcher
30+-----------------------------------------
31+Actions:
32+* Open gedit.
33+* Maximize it. Make sure it remains maximized during the test.
34+* Open Appearance panel in System Settings.
35+* Change Launcher Icon Size.
36+
37+Expected Results:
38+* The gedit window must not flicker behind the launcher.