From 74a371e567c682ff37520fa1cbfb6e0d90521978 Mon Sep 17 00:00:00 2001 From: Person Date: Tue, 7 Mar 2017 18:15:53 -0800 Subject: [PATCH] --Bug fixes -Do not reset rendering process when arrow is double clicked in the palette editor, because nothing has changed. --- Source/Fractorium/PaletteEditor/ColorPickerWidget.cpp | 5 +++-- Source/Fractorium/PaletteEditor/PaletteEditor.cpp | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Fractorium/PaletteEditor/ColorPickerWidget.cpp b/Source/Fractorium/PaletteEditor/ColorPickerWidget.cpp index 778d2c4..8fe6a52 100644 --- a/Source/Fractorium/PaletteEditor/ColorPickerWidget.cpp +++ b/Source/Fractorium/PaletteEditor/ColorPickerWidget.cpp @@ -90,7 +90,8 @@ void ColorPickerWidget::OnColorViewerClicked() void ColorPickerWidget::OnTriangleColorChanged(const QColor& col) { if (col.isValid()) + { m_ColorPanel->Color(col); - - emit ColorChanged(col); + emit ColorChanged(col); + } } diff --git a/Source/Fractorium/PaletteEditor/PaletteEditor.cpp b/Source/Fractorium/PaletteEditor/PaletteEditor.cpp index b27e516..72a9373 100644 --- a/Source/Fractorium/PaletteEditor/PaletteEditor.cpp +++ b/Source/Fractorium/PaletteEditor/PaletteEditor.cpp @@ -240,7 +240,9 @@ void PaletteEditor::OnColorPickerColorChanged(const QColor& col) /// The arrow which was double clicked on void PaletteEditor::OnArrowDoubleClicked(const GradientArrow& arrow) { + blockSignals(true);//Do not update main window when Sync is checked because selecting an arrow as the main color doesn't actually change anything. m_ColorPicker->SetColorPanelColor(arrow.Color()); + blockSignals(false); } ///