From 2c00152ce2475503678a2cc6d5a35235a4cc54b2 Mon Sep 17 00:00:00 2001 From: Shubham Date: Mon, 21 Aug 2023 00:48:01 +0530 Subject: [PATCH] app: Add pattern to context props for tools supporting auto-expand When auto expanding layers, there is an option that allows user to fill the newly expanded part with the pattern. But without this change, it was not possible to change the active pattern without switching to some other tool like bucket fill tool. This commit allows that. --- app/tools/gimpairbrushtool.c | 1 + app/tools/gimpconvolvetool.c | 1 + app/tools/gimphealtool.c | 1 + app/tools/gimpinktool.c | 1 + app/tools/gimpmybrushtool.c | 1 + app/tools/gimppaintbrushtool.c | 3 ++- app/tools/gimppenciltool.c | 1 + app/tools/gimpsmudgetool.c | 1 + 8 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/tools/gimpairbrushtool.c b/app/tools/gimpairbrushtool.c index 4af632f0ca..70555fb8f0 100644 --- a/app/tools/gimpairbrushtool.c +++ b/app/tools/gimpairbrushtool.c @@ -63,6 +63,7 @@ gimp_airbrush_tool_register (GimpToolRegisterCallback callback, gimp_airbrush_options_gui, GIMP_PAINT_OPTIONS_CONTEXT_MASK | GIMP_CONTEXT_PROP_MASK_EXPAND | + GIMP_CONTEXT_PROP_MASK_PATTERN | GIMP_CONTEXT_PROP_MASK_GRADIENT, "gimp-airbrush-tool", _("Airbrush"), diff --git a/app/tools/gimpconvolvetool.c b/app/tools/gimpconvolvetool.c index 4780cadb74..b44fd092a8 100644 --- a/app/tools/gimpconvolvetool.c +++ b/app/tools/gimpconvolvetool.c @@ -70,6 +70,7 @@ gimp_convolve_tool_register (GimpToolRegisterCallback callback, GIMP_TYPE_CONVOLVE_OPTIONS, gimp_convolve_options_gui, GIMP_PAINT_OPTIONS_CONTEXT_MASK | + GIMP_CONTEXT_PROP_MASK_PATTERN | GIMP_CONTEXT_PROP_MASK_EXPAND, "gimp-convolve-tool", _("Blur / Sharpen"), diff --git a/app/tools/gimphealtool.c b/app/tools/gimphealtool.c index 2dfb5bd562..ccdf663bad 100644 --- a/app/tools/gimphealtool.c +++ b/app/tools/gimphealtool.c @@ -49,6 +49,7 @@ gimp_heal_tool_register (GimpToolRegisterCallback callback, GIMP_TYPE_SOURCE_OPTIONS, gimp_heal_options_gui, GIMP_PAINT_OPTIONS_CONTEXT_MASK | + GIMP_CONTEXT_PROP_MASK_PATTERN | GIMP_CONTEXT_PROP_MASK_EXPAND, "gimp-heal-tool", _("Healing"), diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c index a2c4a904a1..6726424bde 100644 --- a/app/tools/gimpinktool.c +++ b/app/tools/gimpinktool.c @@ -65,6 +65,7 @@ gimp_ink_tool_register (GimpToolRegisterCallback callback, GIMP_CONTEXT_PROP_MASK_BACKGROUND | GIMP_CONTEXT_PROP_MASK_OPACITY | GIMP_CONTEXT_PROP_MASK_PAINT_MODE | + GIMP_CONTEXT_PROP_MASK_PATTERN | GIMP_CONTEXT_PROP_MASK_EXPAND, "gimp-ink-tool", _("Ink"), diff --git a/app/tools/gimpmybrushtool.c b/app/tools/gimpmybrushtool.c index 6f5ea9d05d..29182c1684 100644 --- a/app/tools/gimpmybrushtool.c +++ b/app/tools/gimpmybrushtool.c @@ -69,6 +69,7 @@ gimp_mybrush_tool_register (GimpToolRegisterCallback callback, GIMP_CONTEXT_PROP_MASK_OPACITY | GIMP_CONTEXT_PROP_MASK_PAINT_MODE | GIMP_CONTEXT_PROP_MASK_MYBRUSH | + GIMP_CONTEXT_PROP_MASK_PATTERN | GIMP_CONTEXT_PROP_MASK_EXPAND, "gimp-mypaint-brush-tool", _("MyPaint Brush"), diff --git a/app/tools/gimppaintbrushtool.c b/app/tools/gimppaintbrushtool.c index 2b11da84a6..a90f685849 100644 --- a/app/tools/gimppaintbrushtool.c +++ b/app/tools/gimppaintbrushtool.c @@ -53,7 +53,8 @@ gimp_paintbrush_tool_register (GimpToolRegisterCallback callback, gimp_paint_options_gui, GIMP_PAINT_OPTIONS_CONTEXT_MASK | GIMP_CONTEXT_PROP_MASK_EXPAND | - GIMP_CONTEXT_PROP_MASK_GRADIENT, + GIMP_CONTEXT_PROP_MASK_GRADIENT | + GIMP_CONTEXT_PROP_MASK_PATTERN, "gimp-paintbrush-tool", _("Paintbrush"), _("Paintbrush Tool: Paint smooth strokes using a brush"), diff --git a/app/tools/gimppenciltool.c b/app/tools/gimppenciltool.c index 81b5356eaa..18ffc3bb04 100644 --- a/app/tools/gimppenciltool.c +++ b/app/tools/gimppenciltool.c @@ -47,6 +47,7 @@ gimp_pencil_tool_register (GimpToolRegisterCallback callback, gimp_paint_options_gui, GIMP_PAINT_OPTIONS_CONTEXT_MASK | GIMP_CONTEXT_PROP_MASK_EXPAND | + GIMP_CONTEXT_PROP_MASK_PATTERN | GIMP_CONTEXT_PROP_MASK_GRADIENT, "gimp-pencil-tool", _("Pencil"), diff --git a/app/tools/gimpsmudgetool.c b/app/tools/gimpsmudgetool.c index 1600a37a14..59b48a7e8f 100644 --- a/app/tools/gimpsmudgetool.c +++ b/app/tools/gimpsmudgetool.c @@ -51,6 +51,7 @@ gimp_smudge_tool_register (GimpToolRegisterCallback callback, gimp_smudge_options_gui, GIMP_PAINT_OPTIONS_CONTEXT_MASK | GIMP_CONTEXT_PROP_MASK_EXPAND | + GIMP_CONTEXT_PROP_MASK_PATTERN | GIMP_CONTEXT_PROP_MASK_GRADIENT, "gimp-smudge-tool", _("Smudge"),