From b743a8297d324cae59a2b8a07eb6c5dbe1461c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 17 Dec 2002 20:20:31 +0000 Subject: [PATCH] Just make sure the values are read sanely from the config. svn path=/trunk/kdebase/kwin/; revision=194510 --- options.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/options.cpp b/options.cpp index f2e124b447..fc0f8c077d 100644 --- a/options.cpp +++ b/options.cpp @@ -212,14 +212,21 @@ void Options::reload() animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE ); animateMinimizeSpeed = config->readNumEntry("AnimateMinimizeSpeed", 5 ); - autoRaise = config->readBoolEntry("AutoRaise", FALSE ); - autoRaiseInterval = config->readNumEntry("AutoRaiseInterval", 0 ); + if( focusPolicy == ClickToFocus ) { + autoRaise = false; + autoRaiseInterval = 0; + } else { + autoRaise = config->readBoolEntry("AutoRaise", FALSE ); + autoRaiseInterval = config->readNumEntry("AutoRaiseInterval", 0 ); + } shadeHover = config->readBoolEntry("ShadeHover", FALSE ); shadeHoverInterval = config->readNumEntry("ShadeHoverInterval", 250 ); // important: autoRaise implies ClickRaise - clickRaise = autoRaise || config->readBoolEntry("ClickRaise", FALSE ); + // ClickToFocus implies clickRaise too + clickRaise = autoRaise || ( focusPolicy == ClickToFocus ) + || config->readBoolEntry("ClickRaise", FALSE ); borderSnapZone = config->readNumEntry("BorderSnapZone", 10); windowSnapZone = config->readNumEntry("WindowSnapZone", 10);