X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fwidgets%2Fsp-color-wheel-selector.cpp;h=174b071f972680d3a55be23dacd430500e3b1ecf;hb=f67bf41415152c650bdfe59bf8facf244ee3d3bb;hp=584a75dd00b335a3ccf4365f48c6a9a04d38b338;hpb=6b15695578f07a3f72c4c9475c1a261a3021472a;p=inkscape.git

diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp
index 584a75dd0..174b071f9 100644
--- a/src/widgets/sp-color-wheel-selector.cpp
+++ b/src/widgets/sp-color-wheel-selector.cpp
@@ -205,18 +205,21 @@ sp_color_wheel_selector_new (void)
 
 /* Helpers for setting color value */
 
-void ColorWheelSelector::_colorChanged( const SPColor& color, gfloat alpha )
+void ColorWheelSelector::_colorChanged()
 {
+#ifdef DUMP_CHANGE_INFO
+    g_message("ColorWheelSelector::_colorChanged( this=%p, %f, %f, %f,   %f)", this, color.v.c[0], color.v.c[1], color.v.c[2], alpha );
+#endif
     _updating = TRUE;
-    sp_color_wheel_set_color( SP_COLOR_WHEEL( _wheel ), &color );
+    sp_color_wheel_set_color( SP_COLOR_WHEEL( _wheel ), &_color );
 
-    guint32 start = sp_color_get_rgba32_ualpha( &color, 0x00 );
-    guint32 mid = sp_color_get_rgba32_ualpha( &color, 0x7f );
-    guint32 end = sp_color_get_rgba32_ualpha( &color, 0xff );
+    guint32 start = _color.toRGBA32( 0x00 );
+    guint32 mid = _color.toRGBA32( 0x7f );
+    guint32 end = _color.toRGBA32( 0xff );
 
-    sp_color_slider_set_colors (SP_COLOR_SLIDER(_slider), start, mid, end);
+    sp_color_slider_set_colors(SP_COLOR_SLIDER(_slider), start, mid, end);
 
-    ColorScales::setScaled(_adj, alpha);
+    ColorScales::setScaled(_adj, _alpha);
 
     _updating = FALSE;
 }
@@ -241,6 +244,7 @@ void ColorWheelSelector::_adjustmentChanged( GtkAdjustment *adjustment, SPColorW
 
 void ColorWheelSelector::_sliderGrabbed( SPColorSlider *slider, SPColorWheelSelector *cs )
 {
+    (void)slider;
     ColorWheelSelector* wheelSelector = (ColorWheelSelector*)(SP_COLOR_SELECTOR(cs)->base);
     if (!wheelSelector->_dragging) {
         wheelSelector->_dragging = TRUE;
@@ -251,6 +255,7 @@ void ColorWheelSelector::_sliderGrabbed( SPColorSlider *slider, SPColorWheelSele
 
 void ColorWheelSelector::_sliderReleased( SPColorSlider *slider, SPColorWheelSelector *cs )
 {
+    (void)slider;
     ColorWheelSelector* wheelSelector = (ColorWheelSelector*)(SP_COLOR_SELECTOR(cs)->base);
     if (wheelSelector->_dragging) {
         wheelSelector->_dragging = FALSE;
@@ -261,6 +266,7 @@ void ColorWheelSelector::_sliderReleased( SPColorSlider *slider, SPColorWheelSel
 
 void ColorWheelSelector::_sliderChanged( SPColorSlider *slider, SPColorWheelSelector *cs )
 {
+    (void)slider;
     ColorWheelSelector* wheelSelector = (ColorWheelSelector*)(SP_COLOR_SELECTOR(cs)->base);
 
     wheelSelector->_updateInternals( wheelSelector->_color, ColorScales::getScaled( wheelSelector->_adj ), wheelSelector->_dragging );
@@ -273,9 +279,9 @@ void ColorWheelSelector::_wheelChanged( SPColorWheel *wheel, SPColorWheelSelecto
 
     sp_color_wheel_get_color( wheel, &color );
 
-    guint32 start = sp_color_get_rgba32_ualpha( &color, 0x00 );
-    guint32 mid = sp_color_get_rgba32_ualpha( &color, 0x7f );
-    guint32 end = sp_color_get_rgba32_ualpha( &color, 0xff );
+    guint32 start = color.toRGBA32( 0x00 );
+    guint32 mid = color.toRGBA32( 0x7f );
+    guint32 end = color.toRGBA32( 0xff );
 
     sp_color_slider_set_colors (SP_COLOR_SLIDER(wheelSelector->_slider), start, mid, end);