diff options
| author | Tomasz Boczkowski <penginsbacon@gmail.com> | 2015-05-09 12:53:54 +0000 |
|---|---|---|
| committer | Tomasz Boczkowski <penginsbacon@gmail.com> | 2015-05-09 12:53:54 +0000 |
| commit | cd9885ddc7dfbf7769f902dd7ee043892a2c8ee9 (patch) | |
| tree | b85f04d5bca6bce7590685b2b7f019805afcc7ec /src/ui/widget | |
| parent | Using MODE_SOLID_COLOR in paint selector instead of duplicated MODE_COLOR_RGB... (diff) | |
| download | inkscape-cd9885ddc7dfbf7769f902dd7ee043892a2c8ee9.tar.gz inkscape-cd9885ddc7dfbf7769f902dd7ee043892a2c8ee9.zip | |
fixed crash in paint selector when changing from gradient to solid color
(bzr r14059.1.23)
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/color-scales.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp index 5fa5af902..ead636406 100644 --- a/src/ui/widget/color-scales.cpp +++ b/src/ui/widget/color-scales.cpp @@ -376,8 +376,8 @@ void ColorScales::setMode(SPColorScalesMode mode) setScaled(_a[1], rgba[1]); setScaled(_a[2], rgba[2]); setScaled(_a[3], rgba[3]); - _updating = FALSE; _updateSliders(CSC_CHANNELS_ALL); + _updating = FALSE; break; case SP_COLOR_SCALES_MODE_HSV: _setRangeLimit(255.0); @@ -404,8 +404,8 @@ void ColorScales::setMode(SPColorScalesMode mode) setScaled(_a[1], c[1]); setScaled(_a[2], c[2]); setScaled(_a[3], rgba[3]); - _updating = FALSE; _updateSliders(CSC_CHANNELS_ALL); + _updating = FALSE; break; case SP_COLOR_SCALES_MODE_CMYK: _setRangeLimit(100.0); @@ -437,8 +437,8 @@ void ColorScales::setMode(SPColorScalesMode mode) setScaled(_a[3], c[3]); setScaled(_a[4], rgba[3]); - _updating = FALSE; _updateSliders(CSC_CHANNELS_ALL); + _updating = FALSE; break; default: g_warning("file %s: line %d: Illegal color selector mode", __FILE__, __LINE__); @@ -607,11 +607,6 @@ void ColorScales::_updateSliders(guint channels) break; } - // Force the internal color to be updated - if (!_updating) { - _recalcColor(); - } - #ifdef SPCS_PREVIEW rgba = sp_color_scales_get_rgba32(cs); sp_color_preview_set_rgba32(SP_COLOR_PREVIEW(_p), rgba); |