3afdd7c5c2
In GimpDrawable::set_buffer(), and the corresponding gimp_drawable_set_buffer_full() function, take a bounds rectangle, which specifies both the drawable's new offset and its new size, instead of only taking the new offset. In gimp_drawable_real_set_buffer(), set the item size according to the rect dimensions, instead of the buffer dimensions. The rect's width/height may be 0, in which case the buffer's dimensions are used. Adapt the rest of the code. We do this in preparation for maintaining the drawable's bounding box separately from its logical bounds, allowing the drawable content to extend beyond its bounds.
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 <https://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,
|
|
TRUE);
|
|
}
|
|
}
|
|
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, 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);
|
|
}
|