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/selected-color.cpp | |
| 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/selected-color.cpp')
| -rw-r--r-- | src/ui/selected-color.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/ui/selected-color.cpp b/src/ui/selected-color.cpp index 7652e5acf..6573129d3 100644 --- a/src/ui/selected-color.cpp +++ b/src/ui/selected-color.cpp @@ -72,7 +72,7 @@ guint32 SelectedColor::value() const return color().toRGBA32(_alpha); } -void SelectedColor::setColorAlpha(SPColor const &color, gfloat alpha) +void SelectedColor::setColorAlpha(SPColor const &color, gfloat alpha, bool emit_signal) { #ifdef DUMP_CHANGE_INFO g_message("SelectedColor::setColorAlpha( this=%p, %f, %f, %f, %s, %f, %s) in %s", this, color.v.c[0], color.v.c[1], color.v.c[2], (color.icc?color.icc->colorProfile.c_str():"<null>"), alpha, (emit?"YES":"no"), FOO_NAME(_csel)); @@ -100,13 +100,16 @@ void SelectedColor::setColorAlpha(SPColor const &color, gfloat alpha) _color = color; _alpha = alpha; - _updating = true; - if (_held) { - signal_dragged.emit(); - } else { - signal_changed.emit(); + if (emit_signal) + { + _updating = true; + if (_held) { + signal_dragged.emit(); + } else { + signal_changed.emit(); + } + _updating = false; } - _updating = false; #ifdef DUMP_CHANGE_INFO } else { |