3 files changed, 13 insertions, 19 deletions
diff --git a/launcher/Launcher.cpp b/launcher/Launcher.cpp
index b4023ca5d..bd6ebb3c5 100644
--- a/launcher/Launcher.cpp
+++ b/launcher/Launcher.cpp
@@ -91,7 +91,6 @@ const int MOUSE_DEADZONE = 15;
 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 @@ LauncherHideMode Launcher::GetHideMode() const
 
 /* 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 @@ void Launcher::SetHideMode(LauncherHideMode hidemode)
 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);
 }
 
diff --git a/launcher/Launcher.h b/launcher/Launcher.h
index c49199beb..3c1c010d4 100644
--- a/launcher/Launcher.h
+++ b/launcher/Launcher.h
@@ -193,7 +193,6 @@ private:
 
 void OnSelectionChanged(AbstractLauncherIcon::Ptr selection);
 
- bool StrutHack();
 bool StartIconDragTimeout();
 bool OnScrollTimeout();
 bool OnUpdateDragManagerTimeout();
diff --git a/manual-tests/Launcher.txt b/manual-tests/Launcher.txt
index 5345d7f5b..082a7a24f 100644
--- a/manual-tests/Launcher.txt
+++ b/manual-tests/Launcher.txt
@@ -663,3 +663,16 @@ Actions:
 
 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.
+