yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[kwin/aurorae] Default to no close on double click menu button

Browse source 
To increase consistency with other decorations and because it changes
the behavior of the menu button in an unexpected way we default to
double click menu button doesn't close the window.

BUG: 331462
FIXED-IN: 5.0
REVIEW: 116716
This commit is contained in:
Martin Gräßlin 2014-03-11 15:11:32 +01:00
parent b5451a7183
commit 9fc3aabc66
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clients/aurorae/src/qml/MenuButton.qml
View file

@ -19,7 +19,7 @@ import org.kde.qtextracomponents 2.0 as QtExtra
import org.kde.kwin.decoration 0.1
DecorationButton {
property bool closeOnDoubleClick: true
property bool closeOnDoubleClick: false
id: menuButton
buttonType: DecorationOptions.DecorationButtonMenu
QtExtra.QIconItem {
@ -75,12 +75,12 @@ DecorationButton {
}
}
Component.onCompleted: {
menuButton.closeOnDoubleClick = decoration.readConfig("CloseOnDoubleClickMenuButton", true);
menuButton.closeOnDoubleClick = decoration.readConfig("CloseOnDoubleClickMenuButton", false);
}
Connections {
target: decoration
onConfigChanged: {
menuButton.closeOnDoubleClick = decoration.readConfig("CloseOnDoubleClickMenuButton", true);
menuButton.closeOnDoubleClick = decoration.readConfig("CloseOnDoubleClickMenuButton", false);
}
}
}

4
kcmkwin/kwindecoration/decorationmodel.cpp
View file

@ -133,7 +133,7 @@ void DecorationModel::findDecorations()
KConfigGroup config(m_config, data.auroraeName);
data.borderSize = (KDecorationDefines::BorderSize)config.readEntry< int >("BorderSize", KDecorationDefines::BorderNormal);
data.buttonSize = (KDecorationDefines::BorderSize)config.readEntry< int >("ButtonSize", KDecorationDefines::BorderNormal);
data.closeDblClick = config.readEntry< bool >("CloseOnDoubleClickMenuButton", true);
data.closeDblClick = config.readEntry< bool >("CloseOnDoubleClickMenuButton", false);
data.comment = service->comment();
KPluginInfo info(service);
data.author = info.author();
@ -184,7 +184,7 @@ void DecorationModel::findAuroraeThemes()
KConfigGroup config(m_config, data.auroraeName);
data.borderSize = (KDecorationDefines::BorderSize)config.readEntry< int >("BorderSize", KDecorationDefines::BorderNormal);
data.buttonSize = (KDecorationDefines::BorderSize)config.readEntry< int >("ButtonSize", KDecorationDefines::BorderNormal);
data.closeDblClick = config.readEntry< bool >("CloseOnDoubleClickMenuButton", true);
data.closeDblClick = config.readEntry< bool >("CloseOnDoubleClickMenuButton", false);
metaData(data, df);
m_decorations.append(data);
}