From 9fc3aabc665a3862271b1b797963b7ad33583c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 11 Mar 2014 15:11:32 +0100 Subject: [PATCH] [kwin/aurorae] Default to no close on double click menu button 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 --- clients/aurorae/src/qml/MenuButton.qml | 6 +++--- kcmkwin/kwindecoration/decorationmodel.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clients/aurorae/src/qml/MenuButton.qml b/clients/aurorae/src/qml/MenuButton.qml index c62b7542fc..3c3f001794 100644 --- a/clients/aurorae/src/qml/MenuButton.qml +++ b/clients/aurorae/src/qml/MenuButton.qml @@ -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); } } } diff --git a/kcmkwin/kwindecoration/decorationmodel.cpp b/kcmkwin/kwindecoration/decorationmodel.cpp index 9e8b1365a6..3050ccbfc3 100644 --- a/kcmkwin/kwindecoration/decorationmodel.cpp +++ b/kcmkwin/kwindecoration/decorationmodel.cpp @@ -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); }