dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

square constraint with shift key.

Browse source 
2006-04-02  Karine Delvare  <edhel@gimp.org>

	* app/tools/gimprectangletool.c: square constraint with shift key.
This commit is contained in:
Karine Delvare 2006-04-02 20:58:07 +00:00 committed by Karine Delvare
parent 4d4873a581
commit 5e69f1fc12
2 changed files with 55 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2006-04-02 Karine Delvare <edhel@gimp.org>
* app/tools/gimprectangletool.c: square constraint with shift key.
2006-04-02 Michael Natterer <mitch@gimp.org>
Silence compiler warnings about...

59
app/tools/gimprectangletool.c
View file

@ -762,16 +762,11 @@ gimp_rectangle_tool_motion (GimpTool *tool,
curx = ROUND (coords->x);
cury = ROUND (coords->y);
x1 = startx;
y1 = starty;
x2 = curx;
y2 = cury;
inc_x = (x2 - x1);
inc_y = (y2 - y1);
inc_x = curx - startx;
inc_y = cury - starty;
/* If there have been no changes... return */
if (lastx == x2 && lasty == y2)
if (lastx == curx && lasty == cury)
return;
options = GIMP_RECTANGLE_OPTIONS (tool->tool_info->tool_options);
@ -802,6 +797,10 @@ gimp_rectangle_tool_motion (GimpTool *tool,
"x2", &rx2,
"y2", &ry2,
NULL);
x1 = rx1;
y1 = ry1;
x2 = rx2;
y2 = ry2;
switch (function)
{
@ -1046,6 +1045,50 @@ gimp_rectangle_tool_motion (GimpTool *tool,
}
}
/* If the shift key is down, then make the rectangle square (or
* ellipse circular)
*/
if (state & GDK_SHIFT_MASK)
{
switch (function)
{
case RECT_RESIZING_UPPER_LEFT:
if (inc_x != 0)
y1 = y2 - (x2 - x1);
else
x1 = x2 - (y2 - y1);
break;
case RECT_RESIZING_UPPER_RIGHT:
case RECT_RESIZING_TOP:
if (inc_x != 0)
y1 = y2 - (x2 - x1);
else
x2 = x1 + (y2 - y1);
break;
case RECT_RESIZING_LOWER_LEFT:
case RECT_RESIZING_LEFT:
if (inc_x != 0)
y2 = y1 + (x2 - x1);
else
x1 = x2 - (y2 - y1);
break;
case RECT_RESIZING_LOWER_RIGHT:
case RECT_RESIZING_RIGHT:
case RECT_RESIZING_BOTTOM:
if (inc_x != 0)
y2 = y1 + (x2 - x1);
else
x2 = x1 + (y2 - y1);
break;
default:
break;
}
}
/* make sure that the coords are in bounds */
g_object_set (rectangle,
"x1", MIN (x1, x2),