summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Bintz <me@johnbintz.com>2007-02-28 01:38:55 +0000
committerjohncoswell <johncoswell@users.sourceforge.net>2007-02-28 01:38:55 +0000
commitb66dbee4198e847bd089c9b97d9e459dc4e4250c (patch)
tree4a5cc2b4871162d6dd6f4d82917f18392f2c2a31 /src
parentAdd paint bucket tolerance setting and toolbar widget to control tolerance (diff)
downloadinkscape-b66dbee4198e847bd089c9b97d9e459dc4e4250c.tar.gz
inkscape-b66dbee4198e847bd089c9b97d9e459dc4e4250c.zip
Change paint bucket tolerance toolbar to use percentages rather than color channel distance
(bzr r2463)
Diffstat (limited to 'src')
-rw-r--r--src/flood-context.cpp2
-rw-r--r--src/widgets/toolbox.cpp5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index e737b90f9..d1c2ad65b 100644
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
@@ -431,7 +431,7 @@ static void sp_flood_do_flood_fill(SPEventContext *event_context, GdkEvent *even
unsigned char *orig_px = get_pixel(px, (int)pw[NR::X], (int)pw[NR::Y], width);
for (int i = 0; i < 4; i++) { orig_color[i] = orig_px[i]; }
- int tolerance = prefs_get_int_attribute_limited("tools.paintbucket", "tolerance", 1, 0, 255);
+ int tolerance = (255 * prefs_get_int_attribute_limited("tools.paintbucket", "tolerance", 1, 0, 100)) / 100;
while (!fill_queue.empty() && !aborted) {
NR::Point cp = fill_queue.front();
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 788176d9c..049c7f838 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -4434,7 +4434,6 @@ sp_connector_toolbox_new(SPDesktop *desktop)
static void paintbucket_tolerance_changed(GtkAdjustment *adj, GtkWidget *tbl)
{
- prefs_set_int_attribute("tools.paintbucket", "tolerance", (gint)adj->value);
spinbutton_defocus(GTK_OBJECT(tbl));
}
@@ -4447,8 +4446,8 @@ sp_paintbucket_toolbox_new(SPDesktop *desktop)
{
GtkWidget *tolerance = sp_tb_spinbutton(_("Tolerance:"),
_("The maximum allowed difference between the clicked pixel and the neighboring pixels to be counted in the fill"),
- "tools.paintbucket", "tolerance", 8, NULL, tbl, TRUE,
- "inkscape:paintbucket-tolerance", 0, 255, 1.0, 10.0,
+ "tools.paintbucket", "tolerance", 5, NULL, tbl, TRUE,
+ "inkscape:paintbucket-tolerance", 0, 100, 1.0, 10.0,
paintbucket_tolerance_changed, 1, 0);
gtk_box_pack_start(GTK_BOX(tbl), tolerance, FALSE, FALSE,