inhibit SelectedColor::setColorAlpha in the callbacks of it's signals

(bzr r13341.6.43)

4 files changed, 9 insertions, 33 deletions

diff --git a/src/ui/widget/color-entry.cpp b/src/ui/widget/color-entry.cpp
index 56fd6080e..e26cb4ade 100644
--- a/src/ui/widget/color-entry.cpp
+++ b/src/ui/widget/color-entry.cpp
@@ -71,23 +71,17 @@ void ColorEntry::on_changed() {
         if (len < 8) {
             rgba = rgba << (4 * (8 - len));
         }
-        _updating = true;
         if (changed) {
             set_text(str);
         }
         SPColor color(rgba);
-        _color.setColorAlpha(color, SP_RGBA32_A_F(rgba), true);
-        _updating = false;
+        _color.setColorAlpha(color, SP_RGBA32_A_F(rgba));
     }
     g_free(str);
 }
 
 
 void ColorEntry::_onColorChanged() {
-    if (_updating) {
-        return;
-    }
-
     SPColor color = _color.color();
     gdouble alpha = _color.alpha();
 
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index 1187dd081..d679f9273 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -1006,7 +1006,7 @@ void ColorICCSelectorImpl::_adjustmentChanged( GtkAdjustment *adjustment, ColorI
          }
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
      }
-     iccSelector->_impl->_color.setColorAlpha(newColor, scaled, true);
+     iccSelector->_impl->_color.setColorAlpha(newColor, scaled);
      //iccSelector->_updateInternals( newColor, scaled, iccSelector->_impl->_dragging );
      iccSelector->_impl->_updateSliders( match );
 
diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp
index 234e7a2d1..ac1f52da3 100644
--- a/src/ui/widget/color-scales.cpp
+++ b/src/ui/widget/color-scales.cpp
@@ -164,11 +164,6 @@ void ColorScales::_initUI(SPColorScalesMode mode)
 
 void ColorScales::_recalcColor( gboolean changing )
 {
-    if (_updating) {
-        return;
-    }
-    _updating = true;
-
     if ( changing )
     {
         SPColor color;
@@ -198,13 +193,12 @@ void ColorScales::_recalcColor( gboolean changing )
         }
 
         _color.preserveICC();
-        _color.setColorAlpha(color, alpha, true);
+        _color.setColorAlpha(color, alpha);
     }
     else
     {
         // _updateInternals( _color, _alpha, _dragging );
     }
-    _updating = false;
 }
 
 /* Helpers for setting color value */
@@ -232,7 +226,7 @@ void ColorScales::_setRangeLimit( gdouble upper )
 
 void ColorScales::_onColorChanged()
 {
-    if (_updating || !get_visible()) {
+    if (!get_visible()) {
         return;
     }
 #ifdef DUMP_CHANGE_INFO
@@ -468,13 +462,11 @@ void ColorScales::_sliderAnyGrabbed()
     if (_updating) {
         return;
     }
-    _updating = true;
 	if (!_dragging) {
 		_dragging = TRUE;
         _color.setHeld(true);
         _recalcColor( FALSE );
 	}
-	_updating = false;
 }
 
 void ColorScales::_sliderAnyReleased()
@@ -482,13 +474,11 @@ void ColorScales::_sliderAnyReleased()
     if (_updating) {
         return;
     }
-    _updating = true;
 	if (_dragging) {
 		_dragging = FALSE;
         _color.setHeld(false);
         _recalcColor( FALSE );
 	}
-	_updating = false;
 }
 
 void ColorScales::_sliderAnyChanged()
@@ -501,7 +491,9 @@ void ColorScales::_sliderAnyChanged()
 
 void ColorScales::_adjustmentChanged( ColorScales *scales, guint channel )
 {
-	if (scales->_updating) return;
+	if (scales->_updating) {
+	    return;
+	}
 
 	scales->_updateSliders( (1 << channel) );
 	scales->_recalcColor (TRUE);
diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp
index 4bf40dbb6..5f7260635 100644
--- a/src/ui/widget/color-wheel-selector.cpp
+++ b/src/ui/widget/color-wheel-selector.cpp
@@ -161,10 +161,8 @@ void ColorWheelSelector::_colorChanged()
 #ifdef DUMP_CHANGE_INFO
     g_message("ColorWheelSelector::_colorChanged( this=%p, %f, %f, %f,   %f)", this, _color.color().v.c[0], _color.color().v.c[1], _color.color().v.c[2], alpha );
 #endif
-    if (_updating) {
-        return;
-    }
 
+    bool oldval = _updating;
     _updating = true;
     {
         float hsv[3] = {0,0,0};
@@ -180,7 +178,7 @@ void ColorWheelSelector::_colorChanged()
 
     ColorScales::setScaled(_alpha_adjustment->gobj(), _color.alpha());
 
-    _updating = false;
+    _updating = oldval;
 }
 
 void ColorWheelSelector::_adjustmentChanged()
@@ -188,7 +186,6 @@ void ColorWheelSelector::_adjustmentChanged()
     if (_updating) {
         return;
     }
-    _updating = true;
 
     // TODO check this. It looks questionable:
     // if a value is entered between 0 and 1 exclusive, normalize it to (int) 0..255  or 0..100
@@ -200,8 +197,6 @@ void ColorWheelSelector::_adjustmentChanged()
 
     _color.preserveICC();
     _color.setAlpha(ColorScales::getScaled(_alpha_adjustment->gobj()));
-
-    _updating = false;
 }
 
 void ColorWheelSelector::_sliderGrabbed()
@@ -222,10 +217,8 @@ void ColorWheelSelector::_sliderChanged()
         return;
     }
 
-    _updating = true;
     _color.preserveICC();
     _color.setAlpha(ColorScales::getScaled(_alpha_adjustment->gobj()));
-    _updating = false;
 }
 
 void ColorWheelSelector::_wheelChanged(GimpColorWheel *wheel, ColorWheelSelector *wheelSelector)
@@ -233,7 +226,6 @@ void ColorWheelSelector::_wheelChanged(GimpColorWheel *wheel, ColorWheelSelector
     if (wheelSelector->_updating){
         return;
     }
-    wheelSelector->_updating = true;
 
     gdouble h = 0;
     gdouble s = 0;
@@ -255,8 +247,6 @@ void ColorWheelSelector::_wheelChanged(GimpColorWheel *wheel, ColorWheelSelector
 
     wheelSelector->_color.setHeld(gimp_color_wheel_is_adjusting(wheel));
     wheelSelector->_color.setColor(color);
-
-    wheelSelector->_updating = false;
 }