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

app: use gimp_canvas_item_hit() in gimp_transform_tool_oper_update() 

so all the extents calculation and parameter passing is not
duplicated for the first time \o/
This commit is contained in:
Michael Natterer 2011-03-28 18:55:08 +02:00
parent e03a25caeb
commit 365902b582
1 changed files with 10 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
app/tools/gimptransformtool.c
View File

@ -522,56 +522,23 @@ gimp_transform_tool_oper_update (GimpTool *tool,
if (tr_tool->use_mid_handles) if (tr_tool->use_mid_handles)
{ {
gdouble x, y; if (gimp_canvas_item_hit (tr_tool->handles[TRANSFORM_HANDLE_N],
coords->x, coords->y))
x = (tr_tool->tx1 + tr_tool->tx2) / 2.0;
y = (tr_tool->ty1 + tr_tool->ty2) / 2.0;
if (gimp_draw_tool_on_handle (draw_tool, display,
coords->x, coords->y,
GIMP_HANDLE_SQUARE,
x, y,
tr_tool->handle_w, tr_tool->handle_h,
GIMP_HANDLE_ANCHOR_CENTER))
{ {
function = TRANSFORM_HANDLE_N; function = TRANSFORM_HANDLE_N;
} }
else if (gimp_canvas_item_hit (tr_tool->handles[TRANSFORM_HANDLE_E],
x = (tr_tool->tx2 + tr_tool->tx4) / 2.0; coords->x, coords->y))
y = (tr_tool->ty2 + tr_tool->ty4) / 2.0;
if (gimp_draw_tool_on_handle (draw_tool, display,
coords->x, coords->y,
GIMP_HANDLE_SQUARE,
x, y,
tr_tool->handle_w, tr_tool->handle_h,
GIMP_HANDLE_ANCHOR_CENTER))
{ {
function = TRANSFORM_HANDLE_E; function = TRANSFORM_HANDLE_E;
} }
else if (gimp_canvas_item_hit (tr_tool->handles[TRANSFORM_HANDLE_S],
x = (tr_tool->tx3 + tr_tool->tx4) / 2.0; coords->x, coords->y))
y = (tr_tool->ty3 + tr_tool->ty4) / 2.0;
if (gimp_draw_tool_on_handle (draw_tool, display,
coords->x, coords->y,
GIMP_HANDLE_SQUARE,
x, y,
tr_tool->handle_w, tr_tool->handle_h,
GIMP_HANDLE_ANCHOR_CENTER))
{ {
function = TRANSFORM_HANDLE_S; function = TRANSFORM_HANDLE_S;
} }
else if (gimp_canvas_item_hit (tr_tool->handles[TRANSFORM_HANDLE_W],
x = (tr_tool->tx3 + tr_tool->tx1) / 2.0; coords->x, coords->y))
y = (tr_tool->ty3 + tr_tool->ty1) / 2.0;
if (gimp_draw_tool_on_handle (draw_tool, display,
coords->x, coords->y,
GIMP_HANDLE_SQUARE,
x, y,
tr_tool->handle_w, tr_tool->handle_h,
GIMP_HANDLE_ANCHOR_CENTER))
{ {
function = TRANSFORM_HANDLE_W; function = TRANSFORM_HANDLE_W;
} }
@ -579,13 +546,8 @@ gimp_transform_tool_oper_update (GimpTool *tool,
} }
if (tr_tool->use_center && if (tr_tool->use_center &&
gimp_draw_tool_on_handle (draw_tool, display, gimp_canvas_item_hit (tr_tool->handles[TRANSFORM_HANDLE_CENTER],
coords->x, coords->y, coords->x, coords->y))
GIMP_HANDLE_CIRCLE,
tr_tool->tcx, tr_tool->tcy,
MIN (tr_tool->handle_w, tr_tool->handle_h),
MIN (tr_tool->handle_w, tr_tool->handle_h),
GIMP_HANDLE_ANCHOR_CENTER))
{ {
function = TRANSFORM_HANDLE_CENTER; function = TRANSFORM_HANDLE_CENTER;
} }