Fix color selection issues

- Color dialog selection only affects the selected property
- Timebar color setting is now actually committed
- Canceling color dialog when setting color property value in action
  palette now restores the old color

Task-number: QT3DS-2080
Change-Id: I67f6869f59c1840d76edcbaff5f9026cb3e00194
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

1 files changed, 2 insertions, 8 deletions

diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.cpp b/src/Authoring/Studio/Palettes/Action/ActionView.cpp
index 14d42d3a..1cb5ab2d 100644
--- a/src/Authoring/Studio/Palettes/Action/ActionView.cpp
+++ b/src/Authoring/Studio/Palettes/Action/ActionView.cpp
@@ -1074,18 +1074,12 @@ QColor ActionView::showColorDialog(const QColor &color)
 {
     m_currentColor = color;
     CDialogs *dialogs = g_StudioApp.GetDialogs();
-    connect(dialogs, &CDialogs::onColorChanged, this, &ActionView::changeColor);
+    connect(dialogs, &CDialogs::onColorChanged, this, &ActionView::dialogCurrentColorChanged);
     QColor currentColor = dialogs->displayColorDialog(color);
-    disconnect(dialogs, &CDialogs::onColorChanged, this, &ActionView::changeColor);
+    disconnect(dialogs, &CDialogs::onColorChanged, this, &ActionView::dialogCurrentColorChanged);
     return currentColor;
 }
 
-void ActionView::changeColor(const QColor &color)
-{
-    m_currentColor = color;
-    Q_EMIT currentColorChanged();
-}
-
 void ActionView::updateActionStates()
 {
     bool hasValidAction = (m_currentActionIndex != -1) && m_itemHandle.Valid();