37742a9fee
... raises a CRITICAL
gimp_item_{start,end}_move() currently serves two different
purposes: It is used by GimpLayer to suspend/resume mask resizing
of the layer's ancestors; this is necessary whenever an operation
on a layer might affect the size of its ancestors. It is also used
by GimpGroupLayer to suspend/resume its own mask resizing; this, on
the other hand, is only necessary before applying one of the
transformation functions to the group, so that mask modification is
handled by GimpLayer. In other words, the effects of
gimp_item_{start,end}_move() on group layers are only necessary in
a subset of the cases in which these functions are used.
While in itself this isn't a problem, it does cause issues when
removing a group layer: gimp_image_remove_layer() calls
gimp_item_start_move() before removing the layer, and
gimp_item_end_move() afterwards. While the former function is
called while the layer is still attached to the image, the latter
function is called after the layer is no longer attached. Since
GimpGroupLayer pushes an undo step in response to these calls, only
the call to start_move() results in an undo step, while the call to
end_move() doesn't, resulting in an unbalanced
GIMP_UNDO_GROUP_LAYER_START_MOVE undo step on the stack. This
causes problems when undoing the operation.
Add gimp_item_{start,end}_transform() functions, and corresponding
GimpItem::{start,end}_transform() virtual functions, which are more
specialized versions of gimp_item_{start,end}_move(), which should
be used instead of the former before/after transforming an item; in
other cases, such as when removing ot reordering an item,
gimp_item_{start,end}_move() should still be used. The default
implementation of GimpItem::{start,end}_transform() calls
gimp_item_{start,end}_move(), respectively, so subclasses that
override these functions don't have to do that themselves.
In GimpGroupLayer, override GimpItem::{start,end}_transform(),
instead of GimpItem::{start,end}_move(), for the same purpose of
suspending mask resize. This avoids these functions from being
called when removing a layer group, fixing the bug.
254 lines
8.6 KiB
C
254 lines
8.6 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <gdk-pixbuf/gdk-pixbuf.h>
|
|
#include <gegl.h>
|
|
|
|
#include "core-types.h"
|
|
|
|
#include "gimp-memsize.h"
|
|
#include "gimpimage.h"
|
|
#include "gimpgrouplayer.h"
|
|
#include "gimpgrouplayerundo.h"
|
|
|
|
|
|
static void gimp_group_layer_undo_constructed (GObject *object);
|
|
|
|
static gint64 gimp_group_layer_undo_get_memsize (GimpObject *object,
|
|
gint64 *gui_size);
|
|
|
|
static void gimp_group_layer_undo_pop (GimpUndo *undo,
|
|
GimpUndoMode undo_mode,
|
|
GimpUndoAccumulator *accum);
|
|
static void gimp_group_layer_undo_free (GimpUndo *undo,
|
|
GimpUndoMode undo_mode);
|
|
|
|
|
|
G_DEFINE_TYPE (GimpGroupLayerUndo, gimp_group_layer_undo, GIMP_TYPE_ITEM_UNDO)
|
|
|
|
#define parent_class gimp_group_layer_undo_parent_class
|
|
|
|
|
|
static void
|
|
gimp_group_layer_undo_class_init (GimpGroupLayerUndoClass *klass)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
GimpObjectClass *gimp_object_class = GIMP_OBJECT_CLASS (klass);
|
|
GimpUndoClass *undo_class = GIMP_UNDO_CLASS (klass);
|
|
|
|
object_class->constructed = gimp_group_layer_undo_constructed;
|
|
|
|
gimp_object_class->get_memsize = gimp_group_layer_undo_get_memsize;
|
|
|
|
undo_class->pop = gimp_group_layer_undo_pop;
|
|
undo_class->free = gimp_group_layer_undo_free;
|
|
}
|
|
|
|
static void
|
|
gimp_group_layer_undo_init (GimpGroupLayerUndo *undo)
|
|
{
|
|
}
|
|
|
|
static void
|
|
gimp_group_layer_undo_constructed (GObject *object)
|
|
{
|
|
GimpGroupLayerUndo *group_layer_undo = GIMP_GROUP_LAYER_UNDO (object);
|
|
GimpGroupLayer *group;
|
|
|
|
G_OBJECT_CLASS (parent_class)->constructed (object);
|
|
|
|
g_return_if_fail (GIMP_IS_GROUP_LAYER (GIMP_ITEM_UNDO (object)->item));
|
|
|
|
group = GIMP_GROUP_LAYER (GIMP_ITEM_UNDO (object)->item);
|
|
|
|
switch (GIMP_UNDO (object)->undo_type)
|
|
{
|
|
case GIMP_UNDO_GROUP_LAYER_SUSPEND_RESIZE:
|
|
case GIMP_UNDO_GROUP_LAYER_RESUME_RESIZE:
|
|
case GIMP_UNDO_GROUP_LAYER_SUSPEND_MASK:
|
|
case GIMP_UNDO_GROUP_LAYER_START_TRANSFORM:
|
|
case GIMP_UNDO_GROUP_LAYER_END_TRANSFORM:
|
|
break;
|
|
|
|
case GIMP_UNDO_GROUP_LAYER_RESUME_MASK:
|
|
group_layer_undo->mask_buffer =
|
|
_gimp_group_layer_get_suspended_mask(group,
|
|
&group_layer_undo->mask_bounds);
|
|
|
|
if (group_layer_undo->mask_buffer)
|
|
g_object_ref (group_layer_undo->mask_buffer);
|
|
break;
|
|
|
|
case GIMP_UNDO_GROUP_LAYER_CONVERT:
|
|
group_layer_undo->prev_type = gimp_drawable_get_base_type (GIMP_DRAWABLE (group));
|
|
group_layer_undo->prev_precision = gimp_drawable_get_precision (GIMP_DRAWABLE (group));
|
|
group_layer_undo->prev_has_alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (group));
|
|
break;
|
|
|
|
default:
|
|
g_return_if_reached ();
|
|
}
|
|
}
|
|
|
|
static gint64
|
|
gimp_group_layer_undo_get_memsize (GimpObject *object,
|
|
gint64 *gui_size)
|
|
{
|
|
GimpGroupLayerUndo *group_layer_undo = GIMP_GROUP_LAYER_UNDO (object);
|
|
gint64 memsize = 0;
|
|
|
|
memsize += gimp_gegl_buffer_get_memsize (group_layer_undo->mask_buffer);
|
|
|
|
return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
|
|
gui_size);
|
|
}
|
|
|
|
static void
|
|
gimp_group_layer_undo_pop (GimpUndo *undo,
|
|
GimpUndoMode undo_mode,
|
|
GimpUndoAccumulator *accum)
|
|
{
|
|
GimpGroupLayerUndo *group_layer_undo = GIMP_GROUP_LAYER_UNDO (undo);
|
|
GimpGroupLayer *group;
|
|
|
|
group = GIMP_GROUP_LAYER (GIMP_ITEM_UNDO (undo)->item);
|
|
|
|
GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
|
|
|
|
switch (undo->undo_type)
|
|
{
|
|
case GIMP_UNDO_GROUP_LAYER_SUSPEND_RESIZE:
|
|
case GIMP_UNDO_GROUP_LAYER_RESUME_RESIZE:
|
|
if ((undo_mode == GIMP_UNDO_MODE_UNDO &&
|
|
undo->undo_type == GIMP_UNDO_GROUP_LAYER_SUSPEND_RESIZE) ||
|
|
(undo_mode == GIMP_UNDO_MODE_REDO &&
|
|
undo->undo_type == GIMP_UNDO_GROUP_LAYER_RESUME_RESIZE))
|
|
{
|
|
/* resume group layer auto-resizing */
|
|
|
|
gimp_group_layer_resume_resize (group, FALSE);
|
|
}
|
|
else
|
|
{
|
|
/* suspend group layer auto-resizing */
|
|
|
|
gimp_group_layer_suspend_resize (group, FALSE);
|
|
|
|
if (undo->undo_type == GIMP_UNDO_GROUP_LAYER_RESUME_RESIZE &&
|
|
group_layer_undo->mask_buffer)
|
|
{
|
|
GimpLayerMask *mask = gimp_layer_get_mask (GIMP_LAYER (group));
|
|
|
|
gimp_drawable_set_buffer_full (GIMP_DRAWABLE (mask),
|
|
FALSE, NULL,
|
|
group_layer_undo->mask_buffer,
|
|
group_layer_undo->mask_bounds.x,
|
|
group_layer_undo->mask_bounds.y);
|
|
}
|
|
}
|
|
break;
|
|
|
|
case GIMP_UNDO_GROUP_LAYER_SUSPEND_MASK:
|
|
case GIMP_UNDO_GROUP_LAYER_RESUME_MASK:
|
|
if ((undo_mode == GIMP_UNDO_MODE_UNDO &&
|
|
undo->undo_type == GIMP_UNDO_GROUP_LAYER_SUSPEND_MASK) ||
|
|
(undo_mode == GIMP_UNDO_MODE_REDO &&
|
|
undo->undo_type == GIMP_UNDO_GROUP_LAYER_RESUME_MASK))
|
|
{
|
|
/* resume group layer mask auto-resizing */
|
|
|
|
gimp_group_layer_resume_mask (group, FALSE);
|
|
}
|
|
else
|
|
{
|
|
/* suspend group layer mask auto-resizing */
|
|
|
|
gimp_group_layer_suspend_mask (group, FALSE);
|
|
|
|
if (undo->undo_type == GIMP_UNDO_GROUP_LAYER_RESUME_MASK &&
|
|
group_layer_undo->mask_buffer)
|
|
{
|
|
_gimp_group_layer_set_suspended_mask (
|
|
group,
|
|
group_layer_undo->mask_buffer,
|
|
&group_layer_undo->mask_bounds);
|
|
}
|
|
}
|
|
break;
|
|
|
|
case GIMP_UNDO_GROUP_LAYER_START_TRANSFORM:
|
|
case GIMP_UNDO_GROUP_LAYER_END_TRANSFORM:
|
|
if ((undo_mode == GIMP_UNDO_MODE_UNDO &&
|
|
undo->undo_type == GIMP_UNDO_GROUP_LAYER_START_TRANSFORM) ||
|
|
(undo_mode == GIMP_UNDO_MODE_REDO &&
|
|
undo->undo_type == GIMP_UNDO_GROUP_LAYER_END_TRANSFORM))
|
|
{
|
|
/* end group layer transform operation */
|
|
|
|
_gimp_group_layer_end_transform (group, FALSE);
|
|
}
|
|
else
|
|
{
|
|
/* start group layer transform operation */
|
|
|
|
_gimp_group_layer_start_transform (group, FALSE);
|
|
}
|
|
break;
|
|
|
|
case GIMP_UNDO_GROUP_LAYER_CONVERT:
|
|
{
|
|
GimpImageBaseType type;
|
|
GimpPrecision precision;
|
|
gboolean has_alpha;
|
|
|
|
type = gimp_drawable_get_base_type (GIMP_DRAWABLE (group));
|
|
precision = gimp_drawable_get_precision (GIMP_DRAWABLE (group));
|
|
has_alpha = gimp_drawable_has_alpha (GIMP_DRAWABLE (group));
|
|
|
|
gimp_drawable_convert_type (GIMP_DRAWABLE (group),
|
|
gimp_item_get_image (GIMP_ITEM (group)),
|
|
group_layer_undo->prev_type,
|
|
group_layer_undo->prev_precision,
|
|
group_layer_undo->prev_has_alpha,
|
|
NULL,
|
|
0, 0,
|
|
FALSE, NULL);
|
|
|
|
group_layer_undo->prev_type = type;
|
|
group_layer_undo->prev_precision = precision;
|
|
group_layer_undo->prev_has_alpha = has_alpha;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
g_return_if_reached ();
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_group_layer_undo_free (GimpUndo *undo,
|
|
GimpUndoMode undo_mode)
|
|
{
|
|
GimpGroupLayerUndo *group_layer_undo = GIMP_GROUP_LAYER_UNDO (undo);
|
|
|
|
g_clear_object (&group_layer_undo->mask_buffer);
|
|
|
|
GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
|
|
}
|