diff options
| author | Andrea Azzarone <azzaronea@gmail.com> | 2012-07-27 10:09:37 -0400 |
|---|---|---|
| committer | Tarmac <> | 2012-07-27 10:09:37 -0400 |
| commit | 53b98715d9cab674c03c7c88ddf49de69067719d (patch) | |
| tree | e7ecc76fd7a8bd7210390f0e10f580f23ef25178 /launcher | |
| parent | 0d0b998a22cc38adcb223c95078e771a31a11533 (diff) | |
| parent | 218ed96166dc29bf99abebd1ae07b30826464335 (diff) | |
Remove "strut hack" in launcher.cpp. Fixes: https://bugs.launchpad.net/bugs/1024113. Approved by Marco Trevisan (Treviño), jenkins.
(bzr r2525)
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/Launcher.cpp | 18 | ||||
| -rw-r--r-- | launcher/Launcher.h | 1 |
2 files changed, 0 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(); |