From e47f1ef3e3a01f6a8bc261924856b1f5c6bfab14 Mon Sep 17 00:00:00 2001 From: Capostrophic Date: Fri, 28 Dec 2018 20:02:22 +0300 Subject: [PATCH] Fix some color picker regressions Don't assign invalid color returned when the color picker is closed by Cancel as the new color Restore "picking finished" signal to make value saving work again --- apps/opencs/view/widget/coloreditor.cpp | 1 + apps/opencs/view/widget/colorpickerpopup.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/opencs/view/widget/coloreditor.cpp b/apps/opencs/view/widget/coloreditor.cpp index 82ca2b0c9c..e30696458f 100644 --- a/apps/opencs/view/widget/coloreditor.cpp +++ b/apps/opencs/view/widget/coloreditor.cpp @@ -82,6 +82,7 @@ void CSVWidget::ColorEditor::setColor(const int colorInt) void CSVWidget::ColorEditor::showPicker() { mColorPicker->showPicker(calculatePopupPosition(), mColor); + emit pickingFinished(); } void CSVWidget::ColorEditor::pickerColorChanged(const QColor &color) diff --git a/apps/opencs/view/widget/colorpickerpopup.cpp b/apps/opencs/view/widget/colorpickerpopup.cpp index a38728ef3b..206a667276 100644 --- a/apps/opencs/view/widget/colorpickerpopup.cpp +++ b/apps/opencs/view/widget/colorpickerpopup.cpp @@ -39,7 +39,8 @@ void CSVWidget::ColorPickerPopup::showPicker(const QPoint &position, const QColo // Calling getColor() creates a blocking dialog that will continue execution once the user chooses OK or Cancel QColor color = mColorPicker->getColor(initialColor); - mColorPicker->setCurrentColor(color); + if (color.isValid()) + mColorPicker->setCurrentColor(color); } void CSVWidget::ColorPickerPopup::mousePressEvent(QMouseEvent *event)