procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 17:33:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

app: fix pasting into a channel.

Browse source 
It was made impossible to paste into a channel, as this was creating a
normal layer instead. We need to use floating selections when the pasted
target is a GimpChannel type.

Note that the UX is very ugly right now for these (except for the layer
mask case as I improved this a lot with commits 04810ec95e and
28457ce337), so I opened issue Teams/GIMP/Design/gimp-ux/89 to design
further evolutions.
This commit is contained in:
Jehan 2024-08-27 21:20:22 +02:00
parent 17b094ecc4
commit b9a6d8fc70
1 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

37
app/core/gimp-edit.c
View file

@ -955,11 +955,12 @@ gimp_edit_paste (GimpImage *image,
gint viewport_height)
{
GList *layers;
gboolean use_offset = FALSE;
gint layers_bbox_x = 0;
gint layers_bbox_y = 0;
gint offset_y = 0;
gint offset_x = 0;
gboolean use_offset = FALSE;
gint layers_bbox_x = 0;
gint layers_bbox_y = 0;
gint offset_y = 0;
gint offset_x = 0;
GType drawables_type = G_TYPE_NONE;
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
g_return_val_if_fail (GIMP_IS_IMAGE (paste) || GIMP_IS_BUFFER (paste), NULL);
@ -968,6 +969,32 @@ gimp_edit_paste (GimpImage *image,
{
g_return_val_if_fail (GIMP_IS_DRAWABLE (iter->data), NULL);
g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (iter->data)), NULL);
g_return_val_if_fail (gimp_item_get_image (GIMP_ITEM (iter->data)) == image, NULL);
g_return_val_if_fail (drawables_type == G_TYPE_NONE || G_OBJECT_TYPE (iter->data) == drawables_type, NULL);
drawables_type = G_OBJECT_TYPE (iter->data);
/* Currently we can only paste to channels (named channels, layer
* masks, selection, etc.) as floating.
*/
if (GIMP_IS_CHANNEL (iter->data))
{
switch (paste_type)
{
case GIMP_PASTE_TYPE_NEW_LAYER:
case GIMP_PASTE_TYPE_NEW_LAYER_OR_FLOATING:
case GIMP_PASTE_TYPE_NEW_MERGED_LAYER_OR_FLOATING:
paste_type = GIMP_PASTE_TYPE_FLOATING;
break;
case GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE:
case GIMP_PASTE_TYPE_NEW_LAYER_OR_FLOATING_IN_PLACE:
case GIMP_PASTE_TYPE_NEW_MERGED_LAYER_OR_FLOATING_IN_PLACE:
paste_type = GIMP_PASTE_TYPE_FLOATING_IN_PLACE;
break;
default:
break;
}
}
}
if (merged && GIMP_IS_IMAGE (paste))