Merge branch 'jasperh/409818-specific-color-selector' into master

libs/widgets/kis_color_input.cpp

@@ -292,6 +292,24 @@ QWidget* KisFloatColorInput::createInput()
     m_dblNumInput->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
     m_dblNumInput->setMinimumWidth(60);
     m_dblNumInput->setMaximumWidth(60);
+    
+    quint8* data = m_color->data() + m_channelInfo->pos();
+    qreal value = 1.0;
+
+    switch (m_channelInfo->channelValueType()) {
+#ifdef HAVE_OPENEXR
+    case KoChannelInfo::FLOAT16:
+        value = *(reinterpret_cast<half*>(data));
+        break;
+#endif
+    case KoChannelInfo::FLOAT32:
+        value = *(reinterpret_cast<float*>(data));
+        break;
+    default:
+        Q_ASSERT(false);
+    }
+    m_dblNumInput->setValue(value);
+
     return m_dblNumInput;
 }
 
@@ -312,6 +330,7 @@ void KisFloatColorInput::update()
     qreal value = 1.0;
     m_minValue = m_displayRenderer->minVisibleFloatValue(m_channelInfo);
     m_maxValue = m_displayRenderer->maxVisibleFloatValue(m_channelInfo);
+    m_colorSlider->blockSignals(true);
 
     switch (m_channelInfo->channelValueType()) {
 #ifdef HAVE_OPENEXR
@@ -347,8 +366,8 @@ void KisFloatColorInput::update()
     m_colorSlider->setColors(min, max);
 
     const qreal floatRange = m_maxValue - m_minValue;
-    m_dblNumInput->setValue(value);
     m_colorSlider->setValue((value - m_minValue) / floatRange * 255);
+    m_colorSlider->blockSignals(false);
 }
 
 KisHexColorInput::KisHexColorInput(QWidget* parent, KoColor* color, KoColorDisplayRendererInterface *displayRenderer, bool usePercentage) :

libs/widgetutils/kis_double_parse_spin_box.cpp

@@ -128,12 +128,6 @@ QString KisDoubleParseSpinBox::textFromValue(double val) const
     }
     emit noMoreParsingError();
 
-    double v = KisNumericParser::parseSimpleMathExpr(veryCleanText());
-    v = QString("%1").arg(v, 0, 'f', decimals()).toDouble();
-    if (hasFocus() && (v == value() || (v > maximum() && value() == maximum()) || (v < minimum() && value() == minimum())) ) { //solve a very annoying bug where the formula can collapse while editing. With this trick the formula is not lost until focus is lost.
-        return veryCleanText();
-    }
-
     return QDoubleSpinBox::textFromValue(val);
 }
 

libs/widgetutils/kis_int_parse_spin_box.cpp

@@ -140,11 +140,6 @@ QString KisIntParseSpinBox::textFromValue(int val) const
 
     emit noMoreParsingError();
 
-    int v = KisNumericParser::parseIntegerMathExpr(cleanText());
-    if (hasFocus() && (v == value() || (v >= maximum() && value() == maximum()) || (v <= minimum() && value() == minimum())) ) { //solve a very annoying bug where the formula can collapse while editing. With this trick the formula is not lost until focus is lost.
-        return cleanText();
-    }
-
     return QSpinBox::textFromValue(val);
 
 }