summaryrefslogtreecommitdiffstats
path: root/src/widgets/fill-style.cpp
diff options
context:
space:
mode:
authorTomasz Boczkowski <penginsbacon@gmail.com>2015-05-09 11:41:17 +0000
committerTomasz Boczkowski <penginsbacon@gmail.com>2015-05-09 11:41:17 +0000
commitae5fc6f7c5d78bca051dcc308d3344c65fb802cb (patch)
tree7a0fd57a344ca0df7c9b1fdd38198b4e0044954b /src/widgets/fill-style.cpp
parentmerged trunk (diff)
downloadinkscape-ae5fc6f7c5d78bca051dcc308d3344c65fb802cb.tar.gz
inkscape-ae5fc6f7c5d78bca051dcc308d3344c65fb802cb.zip
Using MODE_SOLID_COLOR in paint selector instead of duplicated MODE_COLOR_RGB and MODE_COLOR_CMYK
(bzr r14059.1.22)
Diffstat (limited to 'src/widgets/fill-style.cpp')
-rw-r--r--src/widgets/fill-style.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index 264ebff5a..fa5eabab4 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -431,8 +431,7 @@ void FillNStroke::dragFromPaint()
update = true;
switch (psel->mode) {
- case SPPaintSelector::MODE_COLOR_RGB:
- case SPPaintSelector::MODE_COLOR_CMYK:
+ case SPPaintSelector::MODE_SOLID_COLOR:
{
// local change, do not update from selection
dragId = g_timeout_add_full(G_PRIORITY_DEFAULT, 100, dragDelayCB, this, 0);
@@ -505,8 +504,7 @@ void FillNStroke::updateFromPaint()
break;
}
- case SPPaintSelector::MODE_COLOR_RGB:
- case SPPaintSelector::MODE_COLOR_CMYK:
+ case SPPaintSelector::MODE_SOLID_COLOR:
{
if (kind == FILL) {
// FIXME: fix for GTK breakage, see comment in SelectedStyle::on_opacity_changed; here it results in losing release events