Just make sure the values are read sanely from the config.
svn path=/trunk/kdebase/kwin/; revision=194510
This commit is contained in:
parent
c595302a1f
commit
b743a8297d
1 changed files with 10 additions and 3 deletions
13
options.cpp
13
options.cpp
|
@ -212,14 +212,21 @@ void Options::reload()
|
||||||
animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE );
|
animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE );
|
||||||
animateMinimizeSpeed = config->readNumEntry("AnimateMinimizeSpeed", 5 );
|
animateMinimizeSpeed = config->readNumEntry("AnimateMinimizeSpeed", 5 );
|
||||||
|
|
||||||
autoRaise = config->readBoolEntry("AutoRaise", FALSE );
|
if( focusPolicy == ClickToFocus ) {
|
||||||
autoRaiseInterval = config->readNumEntry("AutoRaiseInterval", 0 );
|
autoRaise = false;
|
||||||
|
autoRaiseInterval = 0;
|
||||||
|
} else {
|
||||||
|
autoRaise = config->readBoolEntry("AutoRaise", FALSE );
|
||||||
|
autoRaiseInterval = config->readNumEntry("AutoRaiseInterval", 0 );
|
||||||
|
}
|
||||||
|
|
||||||
shadeHover = config->readBoolEntry("ShadeHover", FALSE );
|
shadeHover = config->readBoolEntry("ShadeHover", FALSE );
|
||||||
shadeHoverInterval = config->readNumEntry("ShadeHoverInterval", 250 );
|
shadeHoverInterval = config->readNumEntry("ShadeHoverInterval", 250 );
|
||||||
|
|
||||||
// important: autoRaise implies ClickRaise
|
// 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);
|
borderSnapZone = config->readNumEntry("BorderSnapZone", 10);
|
||||||
windowSnapZone = config->readNumEntry("WindowSnapZone", 10);
|
windowSnapZone = config->readNumEntry("WindowSnapZone", 10);
|
||||||
|
|
Loading…
Reference in a new issue