From 58ed2e9a75bca60302a051b30a5d7011a52bc08f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Wed, 3 Oct 2012 18:57:00 +0200 Subject: [PATCH] Hardcode TabBox setting in boxswitch effect false Boxswitch is activated as tabbox, possibly due to a downstream issue This results in multiple effects being assigned to the tabbox and no GUI way for the user to fix this. Since the BoxSwitch effects nowadays only exists as sidearm for coverswitch, the tabbox setting is now hardcoded and disabled in the effect, making it completely impossible to accidentally use it as tabbox. BUG: 303387 REVIEW: 106695 FIXED-IN: 4.9.3 --- effects/boxswitch/boxswitch.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/effects/boxswitch/boxswitch.cpp b/effects/boxswitch/boxswitch.cpp index a24173613d..b642d3f8e1 100644 --- a/effects/boxswitch/boxswitch.cpp +++ b/effects/boxswitch/boxswitch.cpp @@ -42,7 +42,7 @@ BoxSwitchEffect::BoxSwitchEffect() , painting_desktop(0) , animation(false) , highlight_is_set(false) - , primaryTabBox(true) + , primaryTabBox(false) , secondaryTabBox(false) , mProxy(this) , mProxyActivated(0) @@ -86,8 +86,9 @@ void BoxSwitchEffect::reconfigure(ReconfigureFlags) elevate_window = conf.readEntry("ElevateSelected", true); mAnimateSwitch = conf.readEntry("AnimateSwitch", false); - primaryTabBox = conf.readEntry("TabBox", false); - secondaryTabBox = conf.readEntry("TabBoxAlternative", false); + // the tabbox merely exists as CoverSwitch sidearm, force it to be not the tabbox + primaryTabBox = false; + secondaryTabBox = false; } void BoxSwitchEffect::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time)