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)

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-07-16 17:08:29 +0000
+++ launcher/Launcher.cpp	2012-07-19 10:38:20 +0000
@@ -1430,17 +1430,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 +1471,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-19 10:38:20 +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-11 09:39:55 +0000
+++ manual-tests/Launcher.txt	2012-07-19 10:38:20 +0000
@@ -635,3 +635,16 @@
 
 Expected Results:
  * 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.
+