From 305bdba2215cbc4b0420ad214a6f4fb091efea1a Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 31 Jul 2023 09:07:13 +0200 Subject: [PATCH] Beautifier: Fix setting customized style (again) Amends 4de56e2683010c8b22848191405150b4d0e69c82 BoolAspect only changes its value if the check box is "clicked", so when the customized style check box is clicked, the BoolAspect for usePredefinedStyle does not change its value even though the check box does. Fixes: QTCREATORBUG-28525 Change-Id: Ie14c7669c7b41ef1a27dcb5ee69f610b773105fe Reviewed-by: Qt CI Bot Reviewed-by: Reviewed-by: Christian Stenger --- src/plugins/beautifier/clangformat/clangformatsettings.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/beautifier/clangformat/clangformatsettings.cpp b/src/plugins/beautifier/clangformat/clangformatsettings.cpp index cd1f5e20d23..629e4932403 100644 --- a/src/plugins/beautifier/clangformat/clangformatsettings.cpp +++ b/src/plugins/beautifier/clangformat/clangformatsettings.cpp @@ -59,9 +59,6 @@ ClangFormatSettings::ClangFormatSettings() fallbackStyle.addOption("WebKit"); fallbackStyle.setDefaultValue("Default"); - predefinedStyle.setSettingsKey("predefinedStyle"); - predefinedStyle.setDefaultValue("LLVM"); - customStyle.setSettingsKey("customStyle"); documentationFilePath = Core::ICore::userResourcePath(Constants::SETTINGS_DIRNAME) @@ -254,7 +251,8 @@ public: connect(styleButtonGroup, &QButtonGroup::buttonClicked, this, updateEnabled); connect(&s.predefinedStyle, &SelectionAspect::volatileValueChanged, this, updateEnabled); - setOnApply([settings, configurations] { + setOnApply([settings, configurations, customizedStyleButton] { + settings->usePredefinedStyle.setValue(!customizedStyleButton->isChecked()); settings->customStyle.setValue(configurations->currentConfiguration()); settings->save(); });