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

[Andrea Azzarone]

Remove "strut hack" in launcher.cpp

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

== Fix ==
Remove "strut hack". I can't see any regressions without it.

== Test ==
Manual test.

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:2500
http://jenkins.qa.ubuntu.com/job/unity-ci/99/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=amd64/99/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=i386/99/console

review: Approve (continuous-integration)

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:2501
http://jenkins.qa.ubuntu.com/job/unity-ci/101/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=amd64/101/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=i386/101/console

review: Needs Fixing (continuous-integration)

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:2501
http://jenkins.qa.ubuntu.com/job/unity-ci/102/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=amd64/102/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=i386/102/console

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Fine!

review: Approve

[Michal Hruby (mhr3)]

The removal of the timer was causing that the strut wasn't applied in some cases after unity startup. A different fix for the flicker will need to be done.

review: Approve

[Michal Hruby (mhr3)]

Sorry, my comment was supposed to go to https://code.launchpad.net/~andyrock/unity/revert-2525/+merge/118055

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-07-16 17:08:29 +0000
+++ launcher/Launcher.cpp	2012-07-27 11:51:19 +0000
@@ -91,7 +91,6 @@
 const float DRAG_OUT_PIXELS = 300.0f;
 
 const std::string DND_CHECK_TIMEOUT = "dnd-check-timeout";
-const std::string STRUT_HACK_TIMEOUT = "strut-hack-timeout";
 const std::string START_DRAGICON_TIMEOUT = "start-dragicon-timeout";
 const std::string SCROLL_TIMEOUT = "scroll-timeout";
 const std::string ANIMATION_IDLE = "animation-idle";
@@ -1430,17 +1429,6 @@
 
 /* End Launcher Show/Hide logic */
 
-// Hacks around compiz failing to see the struts because the window was just mapped.
-bool Launcher::StrutHack()
-{
-  _parent->InputWindowEnableStruts(false);
-
-  if (options()->hide_mode == LAUNCHER_HIDE_NEVER)
-    _parent->InputWindowEnableStruts(true);
-
-  return false;
-}
-
 void Launcher::OnOptionsChanged(Options::Ptr options)
 {
    UpdateOptions(options);
@@ -1482,12 +1470,6 @@
   else
   {
     _parent->EnableInputWindow(true, launcher::window_title, false, false);
-
-    if (!sources_.GetSource(STRUT_HACK_TIMEOUT))
-    {
-      sources_.AddTimeout(1000, sigc::mem_fun(this, &Launcher::StrutHack), STRUT_HACK_TIMEOUT);
-    }
-
     _parent->InputWindowEnableStruts(true);
   }
 

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2012-07-16 17:08:29 +0000
+++ launcher/Launcher.h	2012-07-27 11:51:19 +0000
@@ -193,7 +193,6 @@
 
   void OnSelectionChanged(AbstractLauncherIcon::Ptr selection);
 
-  bool StrutHack();
   bool StartIconDragTimeout();
   bool OnScrollTimeout();
   bool OnUpdateDragManagerTimeout();

=== modified file 'manual-tests/Launcher.txt'
--- manual-tests/Launcher.txt	2012-07-25 08:38:07 +0000
+++ manual-tests/Launcher.txt	2012-07-27 11:51:19 +0000
@@ -663,3 +663,16 @@
 
 Expected Result:
  * The launcher should autoscroll so you can reach the trash icon.
+
+
+No flickering when resizing the launcher
+----------------------------------------
+Actions:
+ * Open gedit.
+ * Maximize it. Make sure it remains maximized during the test.
+ * Open Appearance panel in System Settings.
+ * Change Launcher Icon Size.
+
+Expected Results:
+ * The gedit window must not flicker behind the launcher.
+