summaryrefslogtreecommitdiffstats
path: root/src/ui/widget/selected-style.cpp
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2014-02-28 15:50:05 +0000
committerMartin Owens <doctormo@gmail.com>2014-02-28 15:50:05 +0000
commit1bc1b442d8ec6f394f456c4675d5ca7f6aa1d0d6 (patch)
tree0b4c86988abeb6c01b23324f159bd0a8a936f485 /src/ui/widget/selected-style.cpp
parentImproved uri testing (diff)
parentSpray tool: (diff)
downloadinkscape-1bc1b442d8ec6f394f456c4675d5ca7f6aa1d0d6.tar.gz
inkscape-1bc1b442d8ec6f394f456c4675d5ca7f6aa1d0d6.zip
Merge to trunk
(bzr r13047.1.7)
Diffstat (limited to 'src/ui/widget/selected-style.cpp')
-rw-r--r--src/ui/widget/selected-style.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index d29554c41..042a6614e 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -1267,6 +1267,11 @@ RotateableSwatch::color_adjust(float *hsla, double by, guint32 cc, guint modifie
} else if (modifier == 3) { // alpha
double old = hsla[3];
hsla[3] += by/2;
+ if (hsla[3] < 0) {
+ hsla[3] = 0;
+ } else if (hsla[3] > 1) {
+ hsla[3] = 1;
+ }
diff = hsla[3] - old;
} else { // hue
double old = hsla[0];