From 360a3e818fc0ece46d3420bf1d1e58ba34d1e3ca Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 1 Aug 2021 20:12:57 +0300 Subject: [PATCH] generic: sync decoration buttons string Signed-off-by: Ivailo Monev --- kcontrol/workspaceoptions/workspaceoptions.cpp | 8 ++++---- kwin/clients/aurorae/theme-description | 2 +- kwin/kcmkwin/kwindecoration/qml/AuroraeDecoration.qml | 2 +- kwin/libkdecorations/kdecoration.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kcontrol/workspaceoptions/workspaceoptions.cpp b/kcontrol/workspaceoptions/workspaceoptions.cpp index 0ec974f9..96f6bb70 100644 --- a/kcontrol/workspaceoptions/workspaceoptions.cpp +++ b/kcontrol/workspaceoptions/workspaceoptions.cpp @@ -112,10 +112,10 @@ void WorkspaceOptionsModule::save() QString desktopTitleBarButtonsLeft = ownButtonsCg.readEntry("DesktopLeft", "MS"); - QString desktopTitleBarButtonsRight = ownButtonsCg.readEntry("DesktopRight", "HIA__X"); + QString desktopTitleBarButtonsRight = ownButtonsCg.readEntry("DesktopRight", "HIAX"); QString netbookTitleBarButtonsLeft = ownButtonsCg.readEntry("NetbookLeft", "MS"); - QString netbookTitleBarButtonsRight = ownButtonsCg.readEntry("NetbookRight", "HA__X"); + QString netbookTitleBarButtonsRight = ownButtonsCg.readEntry("NetbookRight", "HAX"); bool desktopPresentWindowsTabbox = false; @@ -138,7 +138,7 @@ void WorkspaceOptionsModule::save() if (m_currentlyIsDesktop) { //save the user preferences on titlebar buttons desktopTitleBarButtonsLeft = kwinStyleCg.readEntry("ButtonsOnLeft", "MS"); - desktopTitleBarButtonsRight = kwinStyleCg.readEntry("ButtonsOnRight", "HIA__X"); + desktopTitleBarButtonsRight = kwinStyleCg.readEntry("ButtonsOnRight", "HIAX"); ownButtonsCg.writeEntry("DesktopLeft", desktopTitleBarButtonsLeft); ownButtonsCg.writeEntry("DesktopRight", desktopTitleBarButtonsRight); @@ -174,7 +174,7 @@ void WorkspaceOptionsModule::save() } else { //save the user preferences on titlebar buttons netbookTitleBarButtonsLeft = kwinStyleCg.readEntry("ButtonsOnLeft", "MS"); - netbookTitleBarButtonsRight = kwinStyleCg.readEntry("ButtonsOnRight", "HA__X"); + netbookTitleBarButtonsRight = kwinStyleCg.readEntry("ButtonsOnRight", "HAX"); ownButtonsCg.writeEntry("NetbookLeft", netbookTitleBarButtonsLeft); ownButtonsCg.writeEntry("NetbookRight", netbookTitleBarButtonsRight); diff --git a/kwin/clients/aurorae/theme-description b/kwin/clients/aurorae/theme-description index 54962dad..71d986a7 100644 --- a/kwin/clients/aurorae/theme-description +++ b/kwin/clients/aurorae/theme-description @@ -118,7 +118,7 @@ TextShadowOffsetY=0 # Offset of shadow in y direction HaloActive=false # Draw halo behing title of active window (since 4.5) HaloInactive=false # Draw halo behing title of inactive window (since 4.5) LeftButtons=MS # buttons in left button group (see http://api.kde.org/4.x-api/kdebase-workspace-apidocs/kwin/lib/html/classKDecorationOptions.html#8ad12d76c93c5f1a12ea07b30f92d2fa) -RightButtons=HIA__X # buttons in right button group +RightButtons=HIAX # buttons in right button group Shadow=true # decoration provides shadows: you have to add padding [Layout] # uses Layout Manager (see http://api.kde.org/4.x-api/kdebase-workspace-apidocs/kwin/lib/html/classKCommonDecoration.html#7932f74c28432ad8de232f1c6e8751ce) diff --git a/kwin/kcmkwin/kwindecoration/qml/AuroraeDecoration.qml b/kwin/kcmkwin/kwindecoration/qml/AuroraeDecoration.qml index e8108264..74ad78f9 100644 --- a/kwin/kcmkwin/kwindecoration/qml/AuroraeDecoration.qml +++ b/kwin/kcmkwin/kwindecoration/qml/AuroraeDecoration.qml @@ -42,7 +42,7 @@ Item { property bool maximized: false property bool providesContextHelp: true property string leftButtons: "MS" - property string rightButtons: "HIA__X" + property string rightButtons: "HIAX" function titleMouseMoved() {} function readConfig(key, defaultValue) { if (key == "BorderSize") { diff --git a/kwin/libkdecorations/kdecoration.h b/kwin/libkdecorations/kdecoration.h index db71bfa4..27900c31 100644 --- a/kwin/libkdecorations/kdecoration.h +++ b/kwin/libkdecorations/kdecoration.h @@ -335,7 +335,7 @@ public: * in titleButtonsLeft(). * * The default ( which is also returned if customButtonPositions returns false ) - * is "HIA__X". + * is "HIAX". * Unknown buttons in the returned string must be ignored. * The changed flags for this setting is SettingButtons. */ -- 2.11.0