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

app: Cancel functionality works with dynamic layers 

Canceling a paint stroke restores the layer and mask (if present) to the
original size if they were expanded during the stroke. The part of
stroke that is outside the layer remains visible though.
This commit is contained in:
Shubham 2023-08-05 12:25:00 +05:30 committed by Jehan
parent d49fcf9495
commit 5c2373a125
1 changed files with 97 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
app/paint/gimppaintcore.c
View File

@ -719,7 +719,8 @@ gimp_paint_core_cancel (GimpPaintCore *core,
&x, &y, &width, &height)) &x, &y, &width, &height))
{ {
GeglBuffer *undo_buffer; GeglBuffer *undo_buffer;
GeglRectangle rect; GeglRectangle new_rect;
GeglRectangle old_rect;
if (! g_hash_table_steal_extended (core->undo_buffers, iter->data, if (! g_hash_table_steal_extended (core->undo_buffers, iter->data,
NULL, (gpointer*) &undo_buffer)) NULL, (gpointer*) &undo_buffer))
@ -729,6 +730,19 @@ gimp_paint_core_cancel (GimpPaintCore *core,
continue; continue;
} }
old_rect = *(GeglRectangle*) g_hash_table_lookup (core->original_bounds, iter->data);
gimp_item_get_offset (GIMP_ITEM (iter->data), &new_rect.x, &new_rect.y);
new_rect.width = gimp_item_get_width (GIMP_ITEM (iter->data));
new_rect.height = gimp_item_get_height (GIMP_ITEM (iter->data));
if (new_rect.x == old_rect.x &&
new_rect.y == old_rect.y &&
new_rect.width == old_rect.width &&
new_rect.height == old_rect.height)
{
GeglRectangle rect;
gegl_rectangle_align_to_buffer (&rect, gegl_rectangle_align_to_buffer (&rect,
GEGL_RECTANGLE (x, y, width, height), GEGL_RECTANGLE (x, y, width, height),
gimp_drawable_get_buffer (iter->data), gimp_drawable_get_buffer (iter->data),
@ -740,9 +754,79 @@ gimp_paint_core_cancel (GimpPaintCore *core,
gimp_drawable_get_buffer (iter->data), gimp_drawable_get_buffer (iter->data),
&rect); &rect);
g_object_unref (undo_buffer); g_object_unref (undo_buffer);
}
gimp_drawable_update (iter->data, x, y, width, height); gimp_drawable_update (iter->data, x, y, width, height);
}
else
{
GeglBuffer *buffer;
/* drawable is expanded only if drawable is layer or layer mask,
* so drawable cannot be anything else */
g_return_if_fail (GIMP_IS_LAYER (iter->data) || GIMP_IS_LAYER_MASK (iter->data));
/* Restore the original content with new size of the buffer and update view it */
gimp_gegl_buffer_copy (undo_buffer,
NULL,
GEGL_ABYSS_NONE,
gimp_drawable_get_buffer (iter->data),
NULL);
gimp_drawable_update (iter->data, 0, 0, -1, -1);
/* create a copy of original buffer from undo data */
buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
old_rect.width,
old_rect.height),
gimp_drawable_get_format (iter->data));
gimp_gegl_buffer_copy (undo_buffer,
GEGL_RECTANGLE (old_rect.x - new_rect.x,
old_rect.y - new_rect.y,
old_rect.width,
old_rect.height),
GEGL_ABYSS_NONE,
buffer,
GEGL_RECTANGLE (0, 0, 0, 0));
if (GIMP_IS_LAYER_MASK (drawables->data) || GIMP_LAYER (drawables->data)->mask)
{
GeglBuffer *other_old;
GimpDrawable *other_drawable;
if (GIMP_IS_LAYER_MASK (drawables->data))
other_drawable = GIMP_DRAWABLE ((GIMP_LAYER_MASK (drawables->data))->layer);
else
other_drawable = GIMP_DRAWABLE (GIMP_LAYER (drawables->data)->mask);
/* create a copy of original buffer by taking the required area */
other_old = gegl_buffer_new (GEGL_RECTANGLE (0, 0,
old_rect.width,
old_rect.height),
gimp_drawable_get_format (other_drawable));
gimp_gegl_buffer_copy (gimp_drawable_get_buffer (other_drawable),
GEGL_RECTANGLE (old_rect.x - new_rect.x,
old_rect.y - new_rect.y,
old_rect.width,
old_rect.height),
GEGL_ABYSS_NONE,
other_old,
GEGL_RECTANGLE (0, 0, 0, 0));
gimp_drawable_set_buffer_full (other_drawable, FALSE, NULL,
other_old, &old_rect,
FALSE);
g_object_unref (other_old);
}
/* Restore drawable to state before painting started */
gimp_drawable_set_buffer_full (iter->data, FALSE, NULL,
buffer, &old_rect,
FALSE);
gimp_drawable_update (iter->data, 0, 0, -1, -1);
}
}
gimp_viewable_preview_thaw (GIMP_VIEWABLE (iter->data)); gimp_viewable_preview_thaw (GIMP_VIEWABLE (iter->data));
} }