diff options
| author | Martin Owens <doctormo@gmail.com> | 2016-03-29 19:54:04 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2016-03-29 19:54:04 +0000 |
| commit | b2587a888338617bc8482bfc969072b979911719 (patch) | |
| tree | dc85a96520d668f0f46f8e554be9d2ef4fb180cd /src | |
| parent | Fix bugs with the colour selector self-signaling on change. (diff) | |
| download | inkscape-b2587a888338617bc8482bfc969072b979911719.tar.gz inkscape-b2587a888338617bc8482bfc969072b979911719.zip | |
Protect the color wheel from hue loss at a deeper level.
(bzr r14748)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/widget/color-wheel-selector.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/gimpcolorwheel.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp index cac812640..22c616325 100644 --- a/src/ui/widget/color-wheel-selector.cpp +++ b/src/ui/widget/color-wheel-selector.cpp @@ -245,10 +245,10 @@ void ColorWheelSelector::_wheelChanged(GimpColorWheel *wheel, ColorWheelSelector guint32 mid = color.toRGBA32(0x7f); guint32 end = color.toRGBA32(0xff); + wheelSelector->_updating = true; wheelSelector->_slider->setColors(start, mid, end); wheelSelector->_color.preserveICC(); - wheelSelector->_updating = true; wheelSelector->_color.setHeld(gimp_color_wheel_is_adjusting(wheel)); wheelSelector->_color.setColor(color); wheelSelector->_updating = false; diff --git a/src/ui/widget/gimpcolorwheel.c b/src/ui/widget/gimpcolorwheel.c index f632331d8..c857cfa8a 100644 --- a/src/ui/widget/gimpcolorwheel.c +++ b/src/ui/widget/gimpcolorwheel.c @@ -1412,6 +1412,10 @@ gimp_color_wheel_set_color (GimpColorWheel *wheel, priv = wheel->priv; + if(h == 0.0 && s == 0.0) { + h = priv->h; + } + priv->h = h; priv->s = s; priv->v = v; |