From 8e134070e69c22e34d71d5739194282f64a5067a Mon Sep 17 00:00:00 2001 From: GMT 1999 Austin Donnelly Date: Sat, 11 Dec 1999 00:10:09 +0000 Subject: [PATCH] fix problem with layers with non-zero offset. Fri Dec 10 23:55:10 GMT 1999 Austin Donnelly * app/iscissors.c: fix problem with layers with non-zero offset. * app/undo.c: Garry, you missed one "0 -> UNDO_NULL" cleanup :) --- ChangeLog | 6 ++++++ app/core/gimpimage-undo-push.c | 4 ++-- app/iscissors.c | 4 ++-- app/tools/gimpiscissorstool.c | 4 ++-- app/tools/iscissors.c | 4 ++-- app/undo.c | 4 ++-- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c52ef0d54..c6e31738eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Dec 10 23:55:10 GMT 1999 Austin Donnelly + + * app/iscissors.c: fix problem with layers with non-zero offset. + + * app/undo.c: Garry, you missed one "0 -> UNDO_NULL" cleanup :) + 1999-12-10 Garry R. Osgood * app/undo.c : An inadvertent substitution of UndoTypes LAYER_ADD_UNDO diff --git a/app/core/gimpimage-undo-push.c b/app/core/gimpimage-undo-push.c index 583c9b0db7..6a269bd85b 100644 --- a/app/core/gimpimage-undo-push.c +++ b/app/core/gimpimage-undo-push.c @@ -316,7 +316,7 @@ undo_push (GImage *gimage, gimage->dirty = 10000; } - if (gimage->pushing_undo_group ==UNDO_NULL ) + if (gimage->pushing_undo_group == UNDO_NULL) if (! undo_free_up_space (gimage)) return NULL; @@ -520,7 +520,7 @@ undo_get_undo_name (GImage *gimage) g_return_val_if_fail (gimage != NULL, NULL); /* don't want to encourage undo while a group is open */ - if (gimage->pushing_undo_group != 0) + if (gimage->pushing_undo_group != UNDO_NULL) return NULL; return undo_get_topitem_name (gimage->undo_stack); diff --git a/app/iscissors.c b/app/iscissors.c index b9e36ce72e..4f34ff83cf 100644 --- a/app/iscissors.c +++ b/app/iscissors.c @@ -384,7 +384,7 @@ iscissors_button_press (Tool *tool, drawable = gimage_active_drawable (gdisp->gimage); gdisplay_untransform_coords (gdisp, bevent->x, bevent->y, - &iscissors->x, &iscissors->y, FALSE, TRUE); + &iscissors->x, &iscissors->y, FALSE, FALSE); /* If the tool was being used in another image...reset it */ @@ -691,7 +691,7 @@ iscissors_motion (Tool *tool, draw_core_pause (iscissors->core, tool); gdisplay_untransform_coords (gdisp, mevent->x, mevent->y, - &iscissors->x, &iscissors->y, FALSE, TRUE); + &iscissors->x, &iscissors->y, FALSE, FALSE); switch (iscissors->state) { diff --git a/app/tools/gimpiscissorstool.c b/app/tools/gimpiscissorstool.c index b9e36ce72e..4f34ff83cf 100644 --- a/app/tools/gimpiscissorstool.c +++ b/app/tools/gimpiscissorstool.c @@ -384,7 +384,7 @@ iscissors_button_press (Tool *tool, drawable = gimage_active_drawable (gdisp->gimage); gdisplay_untransform_coords (gdisp, bevent->x, bevent->y, - &iscissors->x, &iscissors->y, FALSE, TRUE); + &iscissors->x, &iscissors->y, FALSE, FALSE); /* If the tool was being used in another image...reset it */ @@ -691,7 +691,7 @@ iscissors_motion (Tool *tool, draw_core_pause (iscissors->core, tool); gdisplay_untransform_coords (gdisp, mevent->x, mevent->y, - &iscissors->x, &iscissors->y, FALSE, TRUE); + &iscissors->x, &iscissors->y, FALSE, FALSE); switch (iscissors->state) { diff --git a/app/tools/iscissors.c b/app/tools/iscissors.c index b9e36ce72e..4f34ff83cf 100644 --- a/app/tools/iscissors.c +++ b/app/tools/iscissors.c @@ -384,7 +384,7 @@ iscissors_button_press (Tool *tool, drawable = gimage_active_drawable (gdisp->gimage); gdisplay_untransform_coords (gdisp, bevent->x, bevent->y, - &iscissors->x, &iscissors->y, FALSE, TRUE); + &iscissors->x, &iscissors->y, FALSE, FALSE); /* If the tool was being used in another image...reset it */ @@ -691,7 +691,7 @@ iscissors_motion (Tool *tool, draw_core_pause (iscissors->core, tool); gdisplay_untransform_coords (gdisp, mevent->x, mevent->y, - &iscissors->x, &iscissors->y, FALSE, TRUE); + &iscissors->x, &iscissors->y, FALSE, FALSE); switch (iscissors->state) { diff --git a/app/undo.c b/app/undo.c index 583c9b0db7..6a269bd85b 100644 --- a/app/undo.c +++ b/app/undo.c @@ -316,7 +316,7 @@ undo_push (GImage *gimage, gimage->dirty = 10000; } - if (gimage->pushing_undo_group ==UNDO_NULL ) + if (gimage->pushing_undo_group == UNDO_NULL) if (! undo_free_up_space (gimage)) return NULL; @@ -520,7 +520,7 @@ undo_get_undo_name (GImage *gimage) g_return_val_if_fail (gimage != NULL, NULL); /* don't want to encourage undo while a group is open */ - if (gimage->pushing_undo_group != 0) + if (gimage->pushing_undo_group != UNDO_NULL) return NULL; return undo_get_topitem_name (gimage->undo_stack);