Commit 992bf99d authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

show the extents of the working area if the user moves the mouse out of

2005-08-07  Sven Neumann  <sven@gimp.org>

	* app/tools/gimpforegroundselecttool.c
	(gimp_foreground_select_tool_draw): show the extents of the working
	area if the user moves the mouse out of it. Is this useful?

	* app/tools/gimpforegroundselectoptions.c: removed colons from labels.
parent d46fa426
2005-08-07 Sven Neumann <sven@gimp.org>
* app/tools/gimpforegroundselecttool.c
(gimp_foreground_select_tool_draw): show the extents of the working
area if the user moves the mouse out of it. Is this useful?
* app/tools/gimpforegroundselectoptions.c: removed colons from labels.
2005-08-06 Sven Neumann <sven@gimp.org>
* app/tools/gimpforegroundselectoptions.c: increased default brush
......
......@@ -289,17 +289,17 @@ gimp_foreground_select_options_gui (GimpToolOptions *tool_options)
gtk_widget_show (table);
adj = gimp_prop_opacity_entry_new (config, "granularity-l",
GTK_TABLE (table), 0, row++, "L:");
GTK_TABLE (table), 0, row++, "L");
gtk_range_set_update_policy (GTK_RANGE (GIMP_SCALE_ENTRY_SCALE (adj)),
GTK_UPDATE_DELAYED);
adj = gimp_prop_opacity_entry_new (config, "granularity-a",
GTK_TABLE (table), 0, row++, "a:");
GTK_TABLE (table), 0, row++, "a");
gtk_range_set_update_policy (GTK_RANGE (GIMP_SCALE_ENTRY_SCALE (adj)),
GTK_UPDATE_DELAYED);
adj = gimp_prop_opacity_entry_new (config, "granularity-b",
GTK_TABLE (table), 0, row++, "b:");
GTK_TABLE (table), 0, row++, "b");
gtk_range_set_update_policy (GTK_RANGE (GIMP_SCALE_ENTRY_SCALE (adj)),
GTK_UPDATE_DELAYED);
......
......@@ -512,6 +512,27 @@ gimp_foreground_select_tool_motion (GimpTool *tool,
}
}
static void
gimp_foreground_select_tool_get_area (GimpChannel *mask,
gint *x1,
gint *y1,
gint *x2,
gint *y2)
{
gint width;
gint height;
gimp_channel_bounds (mask, x1, y1, x2, y2);
width = *x2 - *x1;
height = *y2 - *y1;
*x1 = MAX (*x1 - width / 2, 0);
*y1 = MAX (*y1 - height / 2, 0);
*x2 = MIN (*x2 + width / 2, gimp_item_width (GIMP_ITEM (mask)));
*y2 = MIN (*y2 + height / 2, gimp_item_height (GIMP_ITEM (mask)));
}
static void
gimp_foreground_select_tool_draw (GimpDrawTool *draw_tool)
{
......@@ -536,15 +557,33 @@ gimp_foreground_select_tool_draw (GimpDrawTool *draw_tool)
if (fg_select->mask)
{
GimpFreeSelectTool *sel = GIMP_FREE_SELECT_TOOL (tool);
gdouble width;
gint x = sel->last_coords.x;
gint y = sel->last_coords.y;
gdouble radius;
radius = (options->stroke_width /
SCALEFACTOR_Y (GIMP_DISPLAY_SHELL (draw_tool->gdisp->shell)));
radius /= 2;
/* warn if the user is drawing outside of the working area */
{
gint x1, y1;
gint x2, y2;
width = (options->stroke_width /
SCALEFACTOR_Y (GIMP_DISPLAY_SHELL (draw_tool->gdisp->shell)));
gimp_foreground_select_tool_get_area (fg_select->mask,
&x1, &y1, &x2, &y2);
if (x < x1 + radius || x > x2 - radius ||
y < y1 + radius || y > y2 - radius)
{
gimp_draw_tool_draw_rectangle (draw_tool, FALSE,
x1, y1, x2 - x1, y2 - y1, TRUE);
}
}
gimp_draw_tool_draw_arc (draw_tool, FALSE,
sel->last_coords.x - width / 2,
sel->last_coords.y - width / 2,
width, width, 0, 360 * 64,
x - radius, y - radius,
2 * radius, 2 * radius, 0, 360 * 64,
TRUE);
}
else
......@@ -557,7 +596,7 @@ static void
gimp_foreground_select_tool_select (GimpFreeSelectTool *free_sel,
GimpDisplay *gdisp)
{
GimpForegroundSelectTool *fg_select = GIMP_FOREGROUND_SELECT_TOOL (free_sel);
GimpForegroundSelectTool *fg_select;
GimpForegroundSelectOptions *options;
GimpTool *tool = GIMP_TOOL (free_sel);
......@@ -566,9 +605,11 @@ gimp_foreground_select_tool_select (GimpFreeSelectTool *free_sel,
GimpScanConvert *scan_convert;
GimpChannel *mask;
GList *list;
gint x, y;
gint x1, y1;
gint x2, y2;
gint width, height;
fg_select = GIMP_FOREGROUND_SELECT_TOOL (free_sel);
options = GIMP_FOREGROUND_SELECT_OPTIONS (tool->tool_info->tool_options);
if (fg_select->idle_id)
{
......@@ -576,11 +617,9 @@ gimp_foreground_select_tool_select (GimpFreeSelectTool *free_sel,
fg_select->idle_id = 0;
}
if (! drawable)
if (! drawable)
return;
options = GIMP_FOREGROUND_SELECT_OPTIONS (tool->tool_info->tool_options);
gimp_set_busy (gimage->gimp);
scan_convert = gimp_scan_convert_new ();
......@@ -599,14 +638,7 @@ gimp_foreground_select_tool_select (GimpFreeSelectTool *free_sel,
gimp_scan_convert_free (scan_convert);
/* restrict working area to double the size of the bounding box */
gimp_channel_bounds (mask, &x, &y, &x2, &y2);
width = x2 - x;
height = y2 - y;
x = MAX (0, x - width / 2);
y = MAX (0, y - height / 2);
width = MIN (width * 2, gimp_item_width (GIMP_ITEM (mask)) - x);
height = MIN (height * 2, gimp_item_height (GIMP_ITEM (mask)) - y);
gimp_foreground_select_tool_get_area (mask, &x1, &y1, &x2, &y2);
/* apply foreground and background markers */
for (list = fg_select->strokes; list; list = list->next)
......@@ -614,7 +646,7 @@ gimp_foreground_select_tool_select (GimpFreeSelectTool *free_sel,
gimp_drawable_foreground_extract_siox (drawable,
GIMP_DRAWABLE (mask),
x, y, width, height,
x1, y1, x2 - x1, y2 - y1,
options->smoothness,
options->limits,
GIMP_PROGRESS (gdisp));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment