Unity

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

  1. fix-1024113-2.0
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
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) Approve
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.
Revision history for this message
Tim Penhey (thumper) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp 2012-08-03 13:43:50 +0000
+++ launcher/Launcher.cpp 2012-08-06 08:10:42 +0000
@@ -1473,11 +1473,14 @@
1473 }1473 }
1474 else1474 else
1475 {1475 {
1476 static bool first_time = true;
1477
1476 _parent->EnableInputWindow(true, launcher::window_title, false, false);1478 _parent->EnableInputWindow(true, launcher::window_title, false, false);
14771479
1478 if (!sources_.GetSource(STRUT_HACK_TIMEOUT))1480 if (first_time && !sources_.GetSource(STRUT_HACK_TIMEOUT))
1479 {1481 {
1480 sources_.AddTimeout(1000, sigc::mem_fun(this, &Launcher::StrutHack), STRUT_HACK_TIMEOUT);1482 sources_.AddTimeout(1000, sigc::mem_fun(this, &Launcher::StrutHack), STRUT_HACK_TIMEOUT);
1483 first_time = false;
1481 }1484 }
14821485
1483 _parent->InputWindowEnableStruts(true);1486 _parent->InputWindowEnableStruts(true);
14841487
=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt 2012-08-03 13:43:50 +0000
+++ manual-tests/Launcher.txt 2012-08-06 08:10:42 +0000
@@ -679,3 +679,14 @@
679 * No icon flickers near the top panel.679 * No icon flickers near the top panel.
680 * See https://bugs.launchpad.net/unity/+bug/980942/+attachment/3059914/+files/launcher-accordion-effect-tooltip-bug.ogv.680 * See https://bugs.launchpad.net/unity/+bug/980942/+attachment/3059914/+files/launcher-accordion-effect-tooltip-bug.ogv.
681681
682
683No flickering when resizing the launcher
684-----------------------------------------
685Actions:
686* Open gedit.
687* Maximize it. Make sure it remains maximized during the test.
688* Open Appearance panel in System Settings.
689* Change Launcher Icon Size.
690
691Expected Results:
692* The gedit window must not flicker behind the launcher.