Abort color change when user cancels the color dialog

diasurgical · Sep 14, 2024 · 5993d00 · 5993d00
1 parent a92f49f
commit 5993d00
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/source/dialogs/importdialog.cpp b/source/dialogs/importdialog.cpp
@@ -85,7 +85,9 @@ void ImportDialog::on_fontSymbolsEdit_textChanged(const QString &text)
 void ImportDialog::on_fontColorButton_clicked()
 {
     QColor color = QColorDialog::getColor();
-    setRenderColor(color);
+
+    if (color.isValid())
+        setRenderColor(color);
 }
 
 void ImportDialog::on_importButton_clicked()

diff --git a/source/dialogs/settingsdialog.cpp b/source/dialogs/settingsdialog.cpp
@@ -30,13 +30,17 @@ void SettingsDialog::initialize()
 void SettingsDialog::on_defaultPaletteColorPushButton_clicked()
 {
     QColor color = QColorDialog::getColor();
-    this->ui->defaultPaletteColorLineEdit->setText(color.name());
+
+    if (color.isValid())
+        this->ui->defaultPaletteColorLineEdit->setText(color.name());
 }
 
 void SettingsDialog::on_paletteSelectionBorderColorPushButton_clicked()
 {
     QColor color = QColorDialog::getColor();
-    this->ui->paletteSelectionBorderColorLineEdit->setText(color.name());
+
+    if (color.isValid())
+        this->ui->paletteSelectionBorderColorLineEdit->setText(color.name());
 }
 
 void SettingsDialog::on_settingsOkButton_clicked()

diff --git a/source/widgets/palettewidget.cpp b/source/widgets/palettewidget.cpp
@@ -862,11 +862,16 @@ void PaletteWidget::on_colorLineEdit_returnPressed()
 void PaletteWidget::on_colorPickPushButton_clicked()
 {
     QColor color = QColorDialog::getColor();
+    if (!color.isValid())
+        return;
+
     QColor colorEnd;
     if (this->selectedFirstColorIndex == this->selectedLastColorIndex) {
         colorEnd = color;
     } else {
         colorEnd = QColorDialog::getColor();
+        if (!colorEnd.isValid())
+            return;
     }
 
     // Build color editing command and connect it to the current palette widget