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

Merge branch 'OperationSettingError' into 'master'

Browse source 
Issue #246: Selection Tool Operation Setting Error

Closes #246 and #1589

See merge request GNOME/gimp!844
This commit is contained in:
programmer_ceds 2025-06-29 23:49:15 +00:00
commit 9ab563b21a
2 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/tools/gimpselectiontool.c
View file

@ -103,6 +103,7 @@ gimp_selection_tool_init (GimpSelectionTool *selection_tool)
{ {
selection_tool->function = SELECTION_SELECT; selection_tool->function = SELECTION_SELECT;
selection_tool->saved_operation = GIMP_CHANNEL_OP_REPLACE; selection_tool->saved_operation = GIMP_CHANNEL_OP_REPLACE;
selection_tool->held_keys = 0;
selection_tool->saved_show_selection = FALSE; selection_tool->saved_show_selection = FALSE;
selection_tool->undo = NULL; selection_tool->undo = NULL;
@ -162,8 +163,12 @@ gimp_selection_tool_modifier_key (GimpTool *tool,
modify_mask | modify_mask |
GDK_MOD1_MASK; GDK_MOD1_MASK;
selection_tool->held_keys &= state; /* clear the flags for released keys */
if (press) if (press)
{ {
selection_tool->held_keys |= key;
if (key == state || if (key == state ||
/* GimpPolygonSelectTool may mask-out part of the state, which /* GimpPolygonSelectTool may mask-out part of the state, which
* can cause the wrong mode to be restored on release if we don't * can cause the wrong mode to be restored on release if we don't
@ -183,15 +188,28 @@ gimp_selection_tool_modifier_key (GimpTool *tool,
if (! state) if (! state)
{ {
/* last modifier released */ /* last modifier released */
button_op = selection_tool->saved_operation; button_op = selection_tool->saved_operation;
} }
} }
if (state & GDK_MOD1_MASK) if ((state & GDK_MOD1_MASK) ||
((state & selection_tool->held_keys) == 0))
{ {
/* if alt is down, pretend that neither /* if alt is down, pretend that neither
* shift nor control are down * shift nor control are down
*
* The test for at least one flag being set in both state and
* held keys is to prevent the problem described in issue #1589
* where the modifier key is pressed to restrict the movement of a
* floating layer. When the left mouse button is released this
* function is called with a release event for the extend key and the
* state parameter set to 4 to indicate that the modifier key is
* pressed. Without this extra test the operation is set based on the
* the setting of state (to GIMP_CHANNEL_OP_SUBTRACT). The next call
* of this function is then for a press of the modifier key and,
* because state = key = 4 selection_tool->saved_operation is set,
* wrongly, to GIMP_CHANNEL_OP_SUBTRACT, overwriting the intended
* setting
*/ */
button_op = selection_tool->saved_operation; button_op = selection_tool->saved_operation;
} }
@ -202,7 +220,8 @@ gimp_selection_tool_modifier_key (GimpTool *tool,
* if there is actually a modifier pressed, so we don't * if there is actually a modifier pressed, so we don't
* override the "last modifier released" assignment above * override the "last modifier released" assignment above
*/ */
button_op = gimp_modifiers_to_channel_op (state); button_op = gimp_modifiers_to_channel_op (state &
selection_tool->held_keys);
} }
if (button_op != options->operation) if (button_op != options->operation)

3
app/tools/gimpselectiontool.h
View file

@ -41,6 +41,9 @@ struct _GimpSelectionTool
SelectFunction function; /* selection function */ SelectFunction function; /* selection function */
GimpChannelOps saved_operation; /* saved tool options state */ GimpChannelOps saved_operation; /* saved tool options state */
GdkModifierType held_keys; /* only keys that have been pressed are
used to determine the modified
operation type - see issue #1589 */
gint change_count; gint change_count;
gboolean saved_show_selection; gboolean saved_show_selection;