eUgEntOptIc44/gimp
1
1
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-10-06 01:12:40 +02:00
Code Issues Releases Activity

core: Use selection when updating GimpBrushClipboard...

Browse Source 
...and GimpPatternClipboard

Resolves #10046
After 1b64fdf5, gimp_get_clipboard_object () no longer
returns a merged version of the selected area.
This affected the Clipboard Brush, Clipboard Mask,
and Clipboard Pattern, causing them to always use the
entire image instead.

To restore the 2.10 behavior, we check if the pasted
image has a selection. If so, then we call 
gimp_selection_extract () to get the buffer of the
selected area. We also need to unreference this
buffer afterwards, so a boolean check is added once
the buffer has been copied over to the brush and
pattern.
This commit is contained in:
Alx Sa
2025-03-11 12:40:08 +00:00
parent f3eb02b2f0
commit 7013fad34d
2 changed files with 76 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/core/gimpbrushclipboard.c
View File

@@ -31,8 +31,11 @@
#include "gimpbuffer.h"
#include "gimpbrush-private.h"
#include "gimpbrushclipboard.h"
#include "gimpchannel.h"
#include "gimpcontext.h"
#include "gimpimage.h"
#include "gimppickable.h"
#include "gimpselection.h"
#include "gimptempbuf.h"
#include "gimp-intl.h"
@@ -203,7 +206,8 @@ gimp_brush_clipboard_changed (Gimp *gimp,
GimpBrush *brush)
{
GimpObject *paste;
GeglBuffer *buffer = NULL;
GeglBuffer *buffer = NULL;
gboolean unref_buffer = FALSE;
gint width;
gint height;
@@ -214,8 +218,37 @@ gimp_brush_clipboard_changed (Gimp *gimp,
if (GIMP_IS_IMAGE (paste))
{
GimpContext *context = gimp_get_user_context (gimp);
gimp_pickable_flush (GIMP_PICKABLE (paste));
buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (paste));
if (context)
{
GimpChannel *mask = gimp_image_get_mask (GIMP_IMAGE (paste));
if (! gimp_channel_is_empty (mask))
{
GList *pickables;
gint offset_x;
gint offset_y;
pickables = g_list_prepend (NULL, GIMP_IMAGE (paste));
buffer = gimp_selection_extract (GIMP_SELECTION (mask),
pickables, context,
FALSE, FALSE, FALSE,
&offset_x, &offset_y,
NULL);
g_list_free (pickables);
unref_buffer = TRUE;
}
else
{
buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (paste));
}
}
else
{
buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (paste));
}
}
else if (GIMP_IS_BUFFER (paste))
{
@@ -280,6 +313,9 @@ gimp_brush_clipboard_changed (Gimp *gimp,
gimp_temp_buf_get_data (brush->priv->pixmap),
GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
}
if (unref_buffer)
g_object_unref (buffer);
}
else
{

40
app/core/gimppatternclipboard.c
View File

@@ -29,9 +29,11 @@
#include "gimp.h"
#include "gimpbuffer.h"
#include "gimpchannel.h"
#include "gimppatternclipboard.h"
#include "gimpimage.h"
#include "gimppickable.h"
#include "gimpselection.h"
#include "gimptempbuf.h"
#include "gimp-intl.h"
@@ -175,7 +177,8 @@ gimp_pattern_clipboard_changed (Gimp *gimp,
GimpPattern *pattern)
{
GimpObject *paste;
GeglBuffer *buffer = NULL;
GeglBuffer *buffer = NULL;
gboolean unref_buffer = FALSE;
g_clear_pointer (&pattern->mask, gimp_temp_buf_unref);
@@ -183,8 +186,38 @@ gimp_pattern_clipboard_changed (Gimp *gimp,
if (GIMP_IS_IMAGE (paste))
{
GimpContext *context = gimp_get_user_context (gimp);
gimp_pickable_flush (GIMP_PICKABLE (paste));
buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (paste));
if (context)
{
GimpChannel *mask = gimp_image_get_mask (GIMP_IMAGE (paste));
if (! gimp_channel_is_empty (mask))
{
GList *pickables;
gint offset_x;
gint offset_y;
pickables = g_list_prepend (NULL, GIMP_IMAGE (paste));
buffer = gimp_selection_extract (GIMP_SELECTION (mask),
pickables, context,
FALSE, FALSE, FALSE,
&offset_x, &offset_y,
NULL);
g_list_free (pickables);
unref_buffer = TRUE;
}
else
{
buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (paste));
}
}
else
{
buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (paste));
}
}
else if (GIMP_IS_BUFFER (paste))
{
@@ -204,6 +237,9 @@ gimp_pattern_clipboard_changed (Gimp *gimp,
NULL,
gimp_temp_buf_get_data (pattern->mask),
GEGL_AUTO_ROWSTRIDE, GEGL_ABYSS_NONE);
if (unref_buffer)
g_object_unref (buffer);
}
else
{