dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/tools/gimpfreeselecttool.[ch] added the possibility to <alt>+drag the 

2003-05-27  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimpfreeselecttool.[ch]
	* app/tools/gimprectselecttool.[ch]: added the possibility to
	<alt>+drag the whole selection preview line *while* creating the
	selection. Used a modified version of
	http://aeropc5.hut.fi/~mjkorhon/gimp-move-selection.patch (found
	in the mailing list archives). Fixes bug #87688.
This commit is contained in:
Michael Natterer 2003-05-27 11:52:03 +00:00 committed by Michael Natterer
parent 5c04f27cd5
commit 8addf4daa6
5 changed files with 169 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2003-05-27 Michael Natterer <mitch@gimp.org>
* app/tools/gimpfreeselecttool.[ch]
* app/tools/gimprectselecttool.[ch]: added the possibility to
<alt>+drag the whole selection preview line *while* creating the
selection. Used a modified version of
http://aeropc5.hut.fi/~mjkorhon/gimp-move-selection.patch (found
in the mailing list archives). Fixes bug #87688.
2003-05-27 Michael Natterer <mitch@gimp.org>
* app/gui/select-commands.c (select_save_cmd_callback): switch

50
app/tools/gimpfreeselecttool.c
View File

@ -74,6 +74,9 @@ static void gimp_free_select_tool_draw (GimpDrawTool *draw_tool);
static void gimp_free_select_tool_add_point (GimpFreeSelectTool *free_sel,
gdouble x,
gdouble y);
static void gimp_free_select_tool_move_points (GimpFreeSelectTool *free_sel,
gdouble dx,
gdouble dy);
static GimpSelectionToolClass *parent_class = NULL;
@ -162,7 +165,6 @@ gimp_free_select_tool_init (GimpFreeSelectTool *free_select)
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_FREE_SELECT_TOOL_CURSOR);
free_select->points = NULL;
free_select->num_points = 0;
free_select->max_segs = 0;
@ -213,7 +215,8 @@ gimp_free_select_tool_button_press (GimpTool *tool,
break;
}
free_sel->num_points = 0;
free_sel->last_coords = *coords;
free_sel->num_points = 0;
gimp_free_select_tool_add_point (free_sel, coords->x, coords->y);
@ -287,14 +290,29 @@ gimp_free_select_tool_motion (GimpTool *tool,
gimp_tool_cursor_update (tool, coords, state, gdisp);
}
gimp_free_select_tool_add_point (free_sel, coords->x, coords->y);
if (state & GDK_MOD1_MASK)
{
gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
gimp_draw_tool_draw_line (GIMP_DRAW_TOOL (tool),
free_sel->points[free_sel->num_points - 2].x,
free_sel->points[free_sel->num_points - 2].y,
free_sel->points[free_sel->num_points - 1].x,
free_sel->points[free_sel->num_points - 1].y,
FALSE);
gimp_free_select_tool_move_points (free_sel,
coords->x - free_sel->last_coords.x,
coords->y - free_sel->last_coords.y);
gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
}
else
{
gimp_free_select_tool_add_point (free_sel, coords->x, coords->y);
gimp_draw_tool_draw_line (GIMP_DRAW_TOOL (tool),
free_sel->points[free_sel->num_points - 2].x,
free_sel->points[free_sel->num_points - 2].y,
free_sel->points[free_sel->num_points - 1].x,
free_sel->points[free_sel->num_points - 1].y,
FALSE);
}
free_sel->last_coords = *coords;
}
static void
@ -334,3 +352,17 @@ gimp_free_select_tool_add_point (GimpFreeSelectTool *free_sel,
free_sel->num_points++;
}
static void
gimp_free_select_tool_move_points (GimpFreeSelectTool *free_sel,
gdouble dx,
gdouble dy)
{
gint i;
for (i = 0; i < free_sel->num_points; i++)
{
free_sel->points[i].x += dx;
free_sel->points[i].y += dy;
}
}

2
app/tools/gimpfreeselecttool.h
View File

@ -38,6 +38,8 @@ struct _GimpFreeSelectTool
{
GimpSelectionTool parent_instance;
GimpCoords last_coords;
GimpVector2 *points;
gint num_points;
gint max_segs;

217
app/tools/gimprectselecttool.c
View File

@ -48,8 +48,6 @@
#include "gimp-intl.h"
static void gimp_rect_select_tool_class_init (GimpRectSelectToolClass *klass);
static void gimp_rect_select_tool_init (GimpRectSelectTool *rect_select);
@ -184,10 +182,13 @@ gimp_rect_select_tool_button_press (GimpTool *tool,
sel_tool = GIMP_SELECTION_TOOL (tool);
options = GIMP_SELECTION_OPTIONS (tool->tool_info->tool_options);
rect_sel->x = RINT (coords->x);
rect_sel->y = RINT (coords->y);
rect_sel->w = 0;
rect_sel->h = 0;
rect_sel->x = RINT (coords->x);
rect_sel->y = RINT (coords->y);
rect_sel->w = 0;
rect_sel->h = 0;
rect_sel->center = FALSE;
rect_sel->last_coords = *coords;
rect_sel->fixed_mode = options->fixed_mode;
rect_sel->fixed_width = options->fixed_width;
@ -216,8 +217,6 @@ gimp_rect_select_tool_button_press (GimpTool *tool,
rect_sel->fixed_width = MAX (1, rect_sel->fixed_width);
rect_sel->fixed_height = MAX (1, rect_sel->fixed_height);
rect_sel->center = FALSE;
gimp_tool_control_activate (tool->control);
tool->gdisp = gdisp;
@ -338,125 +337,139 @@ gimp_rect_select_tool_motion (GimpTool *tool,
gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
/* Calculate starting point */
if (rect_sel->center)
if (state & GDK_MOD1_MASK)
{
ox = rect_sel->x + rect_sel->w / 2;
oy = rect_sel->y + rect_sel->h / 2;
/* Just move the selection rectangle around */
rect_sel->x += RINT (coords->x - rect_sel->last_coords.x);
rect_sel->y += RINT (coords->y - rect_sel->last_coords.y);
}
else
{
ox = rect_sel->x;
oy = rect_sel->y;
}
/* Change the selection rectangle's size */
switch (rect_sel->fixed_mode)
{
case GIMP_RECT_SELECT_MODE_FIXED_SIZE:
w = (RINT (coords->x) - ox > 0 ?
rect_sel->fixed_width : -rect_sel->fixed_width);
/* Calculate starting point */
h = (RINT (coords->y) - oy > 0 ?
rect_sel->fixed_height : -rect_sel->fixed_height);
break;
case GIMP_RECT_SELECT_MODE_FIXED_RATIO:
ratio = ((gdouble) rect_sel->fixed_height /
(gdouble) rect_sel->fixed_width);
tw = RINT (coords->x) - ox;
th = RINT (coords->y) - oy;
/* This is probably an inefficient way to do it, but it gives
* nicer, more predictable results than the original agorithm
*/
if ((abs (th) < (ratio * abs (tw))) &&
(abs (tw) > (abs (th) / ratio)))
if (rect_sel->center)
{
w = tw;
h = (gint) (tw * ratio);
/* h should have the sign of th */
if ((th < 0 && h > 0) || (th > 0 && h < 0))
h = -h;
ox = rect_sel->x + rect_sel->w / 2;
oy = rect_sel->y + rect_sel->h / 2;
}
else
else
{
h = th;
w = (gint) (th / ratio);
/* w should have the sign of tw */
if ((tw < 0 && w > 0) || (tw > 0 && w < 0))
w = -w;
ox = rect_sel->x;
oy = rect_sel->y;
}
break;
default:
w = (RINT (coords->x) - ox);
h = (RINT (coords->y) - oy);
break;
}
/* If the shift key is down, then make the rectangle square (or
* ellipse circular)
*/
if ((state & GDK_SHIFT_MASK) &&
rect_sel->fixed_mode == GIMP_RECT_SELECT_MODE_FREE)
{
s = MAX (abs (w), abs (h));
if (w < 0)
w = -s;
else
w = s;
if (h < 0)
h = -s;
else
h = s;
}
/* If the control key is down, create the selection from the center out
*/
if (state & GDK_CONTROL_MASK)
{
rect_sel->center = TRUE;
switch (rect_sel->fixed_mode)
{
case GIMP_RECT_SELECT_MODE_FIXED_SIZE:
rect_sel->x = ox - w / 2;
rect_sel->y = oy - h / 2;
rect_sel->w = w;
rect_sel->h = h;
w = (RINT (coords->x) - ox > 0 ?
rect_sel->fixed_width : -rect_sel->fixed_width);
h = (RINT (coords->y) - oy > 0 ?
rect_sel->fixed_height : -rect_sel->fixed_height);
break;
case GIMP_RECT_SELECT_MODE_FIXED_RATIO:
rect_sel->x = ox - w;
rect_sel->y = oy - h;
rect_sel->w = w * 2;
rect_sel->h = h * 2;
ratio = ((gdouble) rect_sel->fixed_height /
(gdouble) rect_sel->fixed_width);
tw = RINT (coords->x) - ox;
th = RINT (coords->y) - oy;
/* This is probably an inefficient way to do it, but it gives
* nicer, more predictable results than the original agorithm
*/
if ((abs (th) < (ratio * abs (tw))) &&
(abs (tw) > (abs (th) / ratio)))
{
w = tw;
h = (gint) (tw * ratio);
/* h should have the sign of th */
if ((th < 0 && h > 0) || (th > 0 && h < 0))
h = -h;
}
else
{
h = th;
w = (gint) (th / ratio);
/* w should have the sign of tw */
if ((tw < 0 && w > 0) || (tw > 0 && w < 0))
w = -w;
}
break;
default:
w = abs (w);
h = abs (h);
rect_sel->x = ox - w;
rect_sel->y = oy - h;
rect_sel->w = 2 * w + 1;
rect_sel->h = 2 * h + 1;
w = (RINT (coords->x) - ox);
h = (RINT (coords->y) - oy);
break;
}
}
else
{
rect_sel->center = FALSE;
rect_sel->x = ox;
rect_sel->y = oy;
rect_sel->w = w;
rect_sel->h = h;
/* If the shift key is down, then make the rectangle square (or
* ellipse circular)
*/
if ((state & GDK_SHIFT_MASK) &&
rect_sel->fixed_mode == GIMP_RECT_SELECT_MODE_FREE)
{
s = MAX (abs (w), abs (h));
if (w < 0)
w = -s;
else
w = s;
if (h < 0)
h = -s;
else
h = s;
}
/* If the control key is down, create the selection from the center out
*/
if (state & GDK_CONTROL_MASK)
{
rect_sel->center = TRUE;
switch (rect_sel->fixed_mode)
{
case GIMP_RECT_SELECT_MODE_FIXED_SIZE:
rect_sel->x = ox - w / 2;
rect_sel->y = oy - h / 2;
rect_sel->w = w;
rect_sel->h = h;
break;
case GIMP_RECT_SELECT_MODE_FIXED_RATIO:
rect_sel->x = ox - w;
rect_sel->y = oy - h;
rect_sel->w = w * 2;
rect_sel->h = h * 2;
break;
default:
w = abs (w);
h = abs (h);
rect_sel->x = ox - w;
rect_sel->y = oy - h;
rect_sel->w = 2 * w + 1;
rect_sel->h = 2 * h + 1;
break;
}
}
else
{
rect_sel->center = FALSE;
rect_sel->x = ox;
rect_sel->y = oy;
rect_sel->w = w;
rect_sel->h = h;
}
}
rect_sel->last_coords = *coords;
gimp_rect_select_tool_update_options (rect_sel, gdisp);
gimp_tool_pop_status (tool);

2
app/tools/gimprectselecttool.h
View File

@ -43,6 +43,8 @@ struct _GimpRectSelectTool
gint center; /* is the selection being created from the
* center out? */
GimpCoords last_coords; /* last button_press/motion coords */
GimpRectSelectMode fixed_mode;
gdouble fixed_width;
gdouble fixed_height;