From 9f6c65603d623ab4fe6913d6a5d7501b32ef4ada Mon Sep 17 00:00:00 2001 From: Paddle Date: Mon, 3 Apr 2023 15:05:54 +0200 Subject: [PATCH] Pref: Color: move middle checkbox and just disable mid color instead of hidding --- src/Gui/DlgSettingsViewColor.cpp | 11 +++++++---- src/Gui/DlgSettingsViewColor.ui | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Gui/DlgSettingsViewColor.cpp b/src/Gui/DlgSettingsViewColor.cpp index b806c1bd8a..19d781ae33 100644 --- a/src/Gui/DlgSettingsViewColor.cpp +++ b/src/Gui/DlgSettingsViewColor.cpp @@ -133,8 +133,8 @@ void DlgSettingsViewColor::onSwitchGradientColorsPressed() void DlgSettingsViewColor::onCheckMidColorToggled(bool val) { - ui->color2Label->setVisible(val); - ui->backgroundColorMid->setVisible(val); + ui->color2Label->setEnabled(val); + ui->backgroundColorMid->setEnabled(val); } void DlgSettingsViewColor::onRadioButtonSimpleToggled(bool val) @@ -163,12 +163,15 @@ void DlgSettingsViewColor::setGradientColorVisibility(bool val) ui->SelectionColor_Background->setVisible(!val); ui->color1Label->setVisible(val); ui->backgroundColorFrom->setVisible(val); - ui->color2Label->setVisible(val && ui->checkMidColor->isChecked()); - ui->backgroundColorMid->setVisible(val && ui->checkMidColor->isChecked()); + ui->color2Label->setVisible(val); + ui->backgroundColorMid->setVisible(val); ui->color3Label->setVisible(val); ui->backgroundColorTo->setVisible(val); ui->checkMidColor->setVisible(val); ui->SwitchGradientColors->setVisible(val); + + if (val) + onCheckMidColorToggled(ui->checkMidColor->isChecked()); } #include "moc_DlgSettingsViewColor.cpp" diff --git a/src/Gui/DlgSettingsViewColor.ui b/src/Gui/DlgSettingsViewColor.ui index 2d259085ff..8f2e27b519 100644 --- a/src/Gui/DlgSettingsViewColor.ui +++ b/src/Gui/DlgSettingsViewColor.ui @@ -388,7 +388,7 @@ - + Color gradient will get selected color as middle color