dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

display: Update vector layer fill with DnD color/patterns

Browse source 
This patch adds to the code that updates
text layers when colors are drag and dropped
on them. It now also allows color and
pattern drag and drops to update the fill
of vector layers.

Link layers are also protected so they won't
be destructively changed unless 
rasterized.
This commit is contained in:
Alx Sa 2026-01-17 15:06:56 +00:00
parent 84e348a27c
commit 916cf84e96
1 changed files with 76 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
app/display/gimpdisplayshell-dnd.c
View file

@ -41,6 +41,7 @@
#include "core/gimplayer.h"
#include "core/gimplayer-new.h"
#include "core/gimplayermask.h"
#include "core/gimplinklayer.h"
#include "core/gimplist.h"
#include "core/gimppattern.h"
#include "core/gimpprogress.h"
@ -49,10 +50,14 @@
#include "path/gimppath.h"
#include "path/gimppath-import.h"
#include "path/gimpvectorlayer.h"
#include "path/gimpvectorlayeroptions.h"
#include "text/gimptext.h"
#include "text/gimptextlayer.h"
#include "tools/gimptools-utils.h"
#include "widgets/gimpdnd.h"
#include "gimpdisplay.h"
@ -390,6 +395,37 @@ gimp_display_shell_dnd_fill (GimpDisplayShell *shell,
g_list_free (drawables);
return;
}
/* We can drop colors on text layers, and colors and patterns on
* vector layers to change their fill. Otherwise, we want to prevent
* destructive fills on non-rasterized layers */
if (gimp_item_is_rasterizable (GIMP_ITEM (iter->data)) &&
! gimp_item_is_rasterized (GIMP_ITEM (iter->data)))
{
gchar *menu_path = _("Layer > Rasterize");
gchar *message = NULL;
if (gimp_item_is_link_layer (GIMP_ITEM (iter->data)))
message = g_strdup_printf (_("Link layers must be rasterized (%s)."),
menu_path);
else if (gimp_item_is_text_layer (GIMP_ITEM (iter->data)) &&
gimp_fill_options_get_style (options) == GIMP_FILL_STYLE_PATTERN)
message = g_strdup_printf (_("Text layers must be rasterized (%s)."),
menu_path);
if (message)
{
gimp_message_literal (shell->display->gimp,
G_OBJECT (shell->display),
GIMP_MESSAGE_ERROR,
message);
g_free (message);
gimp_tools_blink_item (shell->display->gimp,
GIMP_ITEM (iter->data));
g_list_free (drawables);
return;
}
}
}
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_PAINT, undo_desc);
@ -399,20 +435,52 @@ gimp_display_shell_dnd_fill (GimpDisplayShell *shell,
/* FIXME: there should be a virtual method for this that the
* GimpTextLayer can override.
*/
if (gimp_item_is_text_layer (iter->data) &&
(gimp_fill_options_get_style (options) == GIMP_FILL_STYLE_FG_COLOR ||
gimp_fill_options_get_style (options) == GIMP_FILL_STYLE_BG_COLOR))
if (gimp_item_is_text_layer (iter->data) ||
gimp_item_is_vector_layer (iter->data))
{
GeglColor *color;
GimpVectorLayerOptions *vector_options = NULL;
GimpFillOptions *vector_fill = NULL;
GimpPattern *pattern = NULL;
GeglColor *color = NULL;
if (gimp_item_is_vector_layer (iter->data))
vector_options = gimp_vector_layer_get_options (iter->data);
if (vector_options)
vector_fill = vector_options->fill_options;
if (gimp_fill_options_get_style (options) == GIMP_FILL_STYLE_FG_COLOR)
color = gimp_context_get_foreground (GIMP_CONTEXT (options));
else
else if (gimp_fill_options_get_style (options) == GIMP_FILL_STYLE_BG_COLOR)
color = gimp_context_get_background (GIMP_CONTEXT (options));
else
pattern = gimp_context_get_pattern (GIMP_CONTEXT (options));
gimp_text_layer_set (iter->data, NULL,
"color", color,
NULL);
if (color)
{
if (vector_fill)
{
gimp_context_set_foreground (GIMP_CONTEXT (vector_fill),
color);
gimp_fill_options_set_custom_style (vector_fill,
GIMP_CUSTOM_STYLE_SOLID_COLOR);
gimp_vector_layer_refresh (iter->data);
}
else
{
gimp_text_layer_set (iter->data, NULL, "color", color, NULL);
}
}
else if (pattern)
{
if (vector_fill)
{
gimp_context_set_pattern (GIMP_CONTEXT (vector_fill),
pattern);
gimp_fill_options_set_custom_style (vector_fill,
GIMP_CUSTOM_STYLE_PATTERN);
gimp_vector_layer_refresh (iter->data);
}
}
}
else
{