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

app/tools: Use NDE filter's drawable for on-canvas widgets

Browse source 
Resolves #14240
This patch extends a9056419 to use the existing filter's
drawable (if it exists) on all other on-canvas widgets instead
of always using the selected layer.
This commit is contained in:
Alx Sa 2025-06-12 15:11:31 +00:00
parent 03bf117110
commit 9a349e812b
1 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
app/tools/gimpfiltertool-widgets.c
View file

@ -402,14 +402,19 @@ gimp_filter_tool_set_line (Controller *controller,
gdouble x2,
gdouble y2)
{
GimpTool *tool;
GimpDrawable *drawable;
GimpTool *tool;
GimpFilterTool *filter_tool;
GimpDrawable *drawable;
if (! controller->widget)
return;
tool = GIMP_TOOL (controller->filter_tool);
drawable = tool->drawables->data;
filter_tool = controller->filter_tool;
tool = GIMP_TOOL (filter_tool);
if (filter_tool->existing_filter)
drawable = gimp_drawable_filter_get_drawable (filter_tool->existing_filter);
else
drawable = tool->drawables->data;
if (drawable)
{
@ -479,14 +484,19 @@ gimp_filter_tool_set_slider_line (Controller *controller,
const GimpControllerSlider *sliders,
gint n_sliders)
{
GimpTool *tool;
GimpDrawable *drawable;
GimpTool *tool;
GimpFilterTool *filter_tool;
GimpDrawable *drawable;
if (! controller->widget)
return;
tool = GIMP_TOOL (controller->filter_tool);
drawable = tool->drawables->data;
filter_tool = controller->filter_tool;
tool = GIMP_TOOL (filter_tool);
if (filter_tool->existing_filter)
drawable = gimp_drawable_filter_get_drawable (filter_tool->existing_filter);
else
drawable = tool->drawables->data;
if (drawable)
{
@ -572,9 +582,8 @@ gimp_filter_tool_set_transform_grid (Controller *controller,
if (! controller->widget)
return;
tool = GIMP_TOOL (controller->filter_tool);
filter_tool = controller->filter_tool;
tool = GIMP_TOOL (filter_tool);
if (filter_tool->existing_filter)
drawable = gimp_drawable_filter_get_drawable (filter_tool->existing_filter);
else
@ -652,6 +661,7 @@ gimp_filter_tool_set_transform_grids (Controller *controller,
gint n_transforms)
{
GimpTool *tool;
GimpFilterTool *filter_tool;
GimpDisplayShell *shell;
GimpDrawable *drawable;
GimpContainer *grids;
@ -666,9 +676,13 @@ gimp_filter_tool_set_transform_grids (Controller *controller,
if (! controller->widget)
return;
tool = GIMP_TOOL (controller->filter_tool);
shell = gimp_display_get_shell (tool->display);
drawable = tool->drawables->data;
filter_tool = controller->filter_tool;
tool = GIMP_TOOL (filter_tool);
shell = gimp_display_get_shell (tool->display);
if (filter_tool->existing_filter)
drawable = gimp_drawable_filter_get_drawable (filter_tool->existing_filter);
else
drawable = tool->drawables->data;
g_signal_handlers_block_by_func (controller->widget,
gimp_filter_tool_transform_grids_changed,
@ -884,14 +898,19 @@ gimp_filter_tool_set_focus (Controller *controller,
gdouble inner_limit,
gdouble midpoint)
{
GimpTool *tool;
GimpDrawable *drawable;
GimpTool *tool;
GimpFilterTool *filter_tool;
GimpDrawable *drawable;
if (! controller->widget)
return;
tool = GIMP_TOOL (controller->filter_tool);
drawable = tool->drawables->data;
filter_tool = controller->filter_tool;
tool = GIMP_TOOL (filter_tool);
if (filter_tool->existing_filter)
drawable = gimp_drawable_filter_get_drawable (filter_tool->existing_filter);
else
drawable = tool->drawables->data;
if (drawable)
{