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

app: fix right-click cancelling a transform tool 

to only revert back to before the current drag, not do a full reset
This commit is contained in:
Mikael Magnusson 2010-11-07 19:26:48 +01:00 committed by Michael Natterer
parent d6e76a10d6
commit 372bc90f65
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/tools/gimptransformtool.c
View File

@ -209,8 +209,9 @@ gimp_transform_tool_init (GimpTransformTool *tr_tool)
for (i = 0; i < TRANS_INFO_SIZE; i++)
{
tr_tool->trans_info[i] = 0.0;
tr_tool->old_trans_info[i] = 0.0;
tr_tool->trans_info[i] = 0.0;
tr_tool->old_trans_info[i] = 0.0;
tr_tool->prev_trans_info[i] = 0.0;
}
gimp_matrix3_identity (&tr_tool->transform);
@ -347,7 +348,10 @@ gimp_transform_tool_initialize (GimpTool *tool,
/* Save the current transformation info */
for (i = 0; i < TRANS_INFO_SIZE; i++)
tr_tool->old_trans_info[i] = tr_tool->trans_info[i];
{
tr_tool->old_trans_info[i] = tr_tool->trans_info[i];
tr_tool->prev_trans_info[i] = tr_tool->trans_info[i];
}
}
return TRUE;
@ -419,6 +423,10 @@ gimp_transform_tool_button_release (GimpTool *tool,
{
gimp_transform_tool_response (NULL, GTK_RESPONSE_OK, tr_tool);
}
/* Restore the previous transformation info */
for (i = 0; i < TRANS_INFO_SIZE; i++)
tr_tool->prev_trans_info[i] = tr_tool->trans_info[i];
}
else
{
@ -426,7 +434,7 @@ gimp_transform_tool_button_release (GimpTool *tool,
/* Restore the previous transformation info */
for (i = 0; i < TRANS_INFO_SIZE; i++)
tr_tool->trans_info[i] = tr_tool->old_trans_info[i];
tr_tool->trans_info[i] = tr_tool->prev_trans_info[i];
/* reget the selection bounds */
gimp_transform_tool_bounds (tr_tool, display);

4
app/tools/gimptransformtool.h
View File

@ -69,8 +69,8 @@ struct _GimpTransformTool
GimpMatrix3 transform; /* transformation matrix */
TransInfo trans_info; /* transformation info */
TransInfo old_trans_info; /* for cancelling a drag operation */
TransInfo old_trans_info; /* for resetting everything */
TransInfo prev_trans_info; /* for cancelling a drag operation */
TileManager *original; /* pointer to original tiles */