From 1c8d5bf942902f68468ed8a43291d9345c3c1816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetronsolutions.com>
Date: Fri, 29 Jun 2018 13:38:02 +0200
Subject: [PATCH] AppFwk: Color editor no longer calls setValueToField on
 update GUI

---
 Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp | 12 ++++++------
 Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp
index 762bf151d2..287a3bd3f9 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp
@@ -83,7 +83,7 @@ void PdmUiColorEditor::configureAndUpdateUi(const QString& uiConfigName)
     }
 
     QColor col = uiField()->uiValue().value<QColor>();
-    setColor(col);
+    setColorOnWidget(col);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -137,14 +137,17 @@ void PdmUiColorEditor::colorSelectionClicked()
     QColor newColor = QColorDialog::getColor(m_color, m_colorPixmapLabel, "Select color", flags);
     if (newColor.isValid() && newColor != m_color)
     {
-        setColor(newColor);
+        setColorOnWidget(newColor);
+        QVariant v;
+        v = newColor;
+        this->setValueToField(v);
     }
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void PdmUiColorEditor::setColor(const QColor& color)
+void PdmUiColorEditor::setColorOnWidget(const QColor& color)
 {
     if (m_color != color)
     {
@@ -172,9 +175,6 @@ void PdmUiColorEditor::setColor(const QColor& color)
         m_colorTextLabel->setText(colorString);
     }
     
-    QVariant v;
-    v = m_color;
-    this->setValueToField(v);
 }
 
 
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.h
index 32205d4795..9c14611142 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.h
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.h
@@ -86,7 +86,7 @@ protected slots:
     void                colorSelectionClicked();
 
 private:
-    void                setColor(const QColor& c);
+    void                setColorOnWidget(const QColor& c);
 
 private:
     QPointer<QLabel>    m_label;