Part of it reverts commit 3a53e4743e.
Another part is a fix to the CRITICAL mentioned in this commit.
This being said, it's clearly not entirely right yet. The boundaries of
the layer when the filter is merged are not correct, which is especially
visible when trying to draw on this layer afterwards.
Also the layer group boundaries (when reproducing the steps in #16010)
are clearly wrong too.
212 lines
7.3 KiB
C
212 lines
7.3 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 "libgimpbase/gimpbase.h"
|
|
|
|
#include "core-types.h"
|
|
|
|
#include "gimp-memsize.h"
|
|
#include "gimpimage.h"
|
|
#include "gimpdrawable.h"
|
|
#include "gimpdrawable-filters.h"
|
|
#include "gimpdrawableundo.h"
|
|
|
|
|
|
enum
|
|
{
|
|
PROP_0,
|
|
PROP_BUFFER,
|
|
PROP_X,
|
|
PROP_Y
|
|
};
|
|
|
|
|
|
static void gimp_drawable_undo_constructed (GObject *object);
|
|
static void gimp_drawable_undo_set_property (GObject *object,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec);
|
|
static void gimp_drawable_undo_get_property (GObject *object,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec);
|
|
|
|
static gint64 gimp_drawable_undo_get_memsize (GimpObject *object,
|
|
gint64 *gui_size);
|
|
|
|
static void gimp_drawable_undo_pop (GimpUndo *undo,
|
|
GimpUndoMode undo_mode,
|
|
GimpUndoAccumulator *accum);
|
|
static void gimp_drawable_undo_free (GimpUndo *undo,
|
|
GimpUndoMode undo_mode);
|
|
|
|
|
|
G_DEFINE_TYPE (GimpDrawableUndo, gimp_drawable_undo, GIMP_TYPE_ITEM_UNDO)
|
|
|
|
#define parent_class gimp_drawable_undo_parent_class
|
|
|
|
|
|
static void
|
|
gimp_drawable_undo_class_init (GimpDrawableUndoClass *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_drawable_undo_constructed;
|
|
object_class->set_property = gimp_drawable_undo_set_property;
|
|
object_class->get_property = gimp_drawable_undo_get_property;
|
|
|
|
gimp_object_class->get_memsize = gimp_drawable_undo_get_memsize;
|
|
|
|
undo_class->pop = gimp_drawable_undo_pop;
|
|
undo_class->free = gimp_drawable_undo_free;
|
|
|
|
g_object_class_install_property (object_class, PROP_BUFFER,
|
|
g_param_spec_object ("buffer", NULL, NULL,
|
|
GEGL_TYPE_BUFFER,
|
|
GIMP_PARAM_READWRITE |
|
|
G_PARAM_CONSTRUCT_ONLY));
|
|
|
|
g_object_class_install_property (object_class, PROP_X,
|
|
g_param_spec_int ("x", NULL, NULL,
|
|
-GIMP_MAX_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE, 0,
|
|
GIMP_PARAM_READWRITE |
|
|
G_PARAM_CONSTRUCT_ONLY));
|
|
|
|
g_object_class_install_property (object_class, PROP_Y,
|
|
g_param_spec_int ("y", NULL, NULL,
|
|
-GIMP_MAX_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE, 0,
|
|
GIMP_PARAM_READWRITE |
|
|
G_PARAM_CONSTRUCT_ONLY));
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_undo_init (GimpDrawableUndo *undo)
|
|
{
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_undo_constructed (GObject *object)
|
|
{
|
|
GimpDrawableUndo *drawable_undo = GIMP_DRAWABLE_UNDO (object);
|
|
|
|
G_OBJECT_CLASS (parent_class)->constructed (object);
|
|
|
|
gimp_assert (GIMP_IS_DRAWABLE (GIMP_ITEM_UNDO (object)->item));
|
|
gimp_assert (GEGL_IS_BUFFER (drawable_undo->buffer));
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_undo_set_property (GObject *object,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
GimpDrawableUndo *drawable_undo = GIMP_DRAWABLE_UNDO (object);
|
|
|
|
switch (property_id)
|
|
{
|
|
case PROP_BUFFER:
|
|
drawable_undo->buffer = g_value_dup_object (value);
|
|
break;
|
|
case PROP_X:
|
|
drawable_undo->x = g_value_get_int (value);
|
|
break;
|
|
case PROP_Y:
|
|
drawable_undo->y = g_value_get_int (value);
|
|
break;
|
|
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_undo_get_property (GObject *object,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
GimpDrawableUndo *drawable_undo = GIMP_DRAWABLE_UNDO (object);
|
|
|
|
switch (property_id)
|
|
{
|
|
case PROP_BUFFER:
|
|
g_value_set_object (value, drawable_undo->buffer);
|
|
break;
|
|
case PROP_X:
|
|
g_value_set_int (value, drawable_undo->x);
|
|
break;
|
|
case PROP_Y:
|
|
g_value_set_int (value, drawable_undo->y);
|
|
break;
|
|
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static gint64
|
|
gimp_drawable_undo_get_memsize (GimpObject *object,
|
|
gint64 *gui_size)
|
|
{
|
|
GimpDrawableUndo *drawable_undo = GIMP_DRAWABLE_UNDO (object);
|
|
gint64 memsize = 0;
|
|
|
|
memsize += gimp_gegl_buffer_get_memsize (drawable_undo->buffer);
|
|
|
|
return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
|
|
gui_size);
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_undo_pop (GimpUndo *undo,
|
|
GimpUndoMode undo_mode,
|
|
GimpUndoAccumulator *accum)
|
|
{
|
|
GimpDrawableUndo *drawable_undo = GIMP_DRAWABLE_UNDO (undo);
|
|
GimpDrawable *drawable = GIMP_DRAWABLE (GIMP_ITEM_UNDO (undo)->item);
|
|
|
|
GIMP_UNDO_CLASS (parent_class)->pop (undo, undo_mode, accum);
|
|
|
|
gimp_drawable_swap_pixels (drawable,
|
|
drawable_undo->buffer,
|
|
drawable_undo->x,
|
|
drawable_undo->y);
|
|
|
|
if (gimp_drawable_has_visible_filters (drawable))
|
|
gimp_drawable_update (drawable, 0, 0, -1, -1);
|
|
}
|
|
|
|
static void
|
|
gimp_drawable_undo_free (GimpUndo *undo,
|
|
GimpUndoMode undo_mode)
|
|
{
|
|
GimpDrawableUndo *drawable_undo = GIMP_DRAWABLE_UNDO (undo);
|
|
|
|
g_clear_object (&drawable_undo->buffer);
|
|
|
|
GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
|
|
}
|