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

app: revert to previously selected drawables when getting out of quick mask.

Browse source
This commit is contained in:
Jehan 2025-10-16 00:54:43 +02:00
parent 931f60923a
commit 11dc1c6b47
3 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/core/gimpimage-private.h
View file

@ -138,6 +138,7 @@ struct _GimpImagePrivate
gboolean quick_mask_state; /* TRUE if quick mask is on */
gboolean quick_mask_inverted; /* TRUE if quick mask is inverted */
GeglColor *quick_mask_color; /* rgba triplet of the color */
GList *quick_mask_selected; /* Drawables selected to revert */
/* Undo apparatus */
GimpUndoStack *undo_stack; /* stack for undo operations */

31
app/core/gimpimage-quick-mask.c
View file

@ -39,9 +39,6 @@
#include "gimp-intl.h"
#define CHANNEL_WAS_ACTIVE (0x2)
/* public functions */
void
@ -51,7 +48,6 @@ gimp_image_set_quick_mask_state (GimpImage *image,
GimpImagePrivate *private;
GimpChannel *selection;
GimpChannel *mask;
gboolean channel_was_active;
g_return_if_fail (GIMP_IS_IMAGE (image));
@ -60,27 +56,18 @@ gimp_image_set_quick_mask_state (GimpImage *image,
private = GIMP_IMAGE_GET_PRIVATE (image);
/* Keep track of the state so that we can make the right drawable
* active again when deactiviting quick mask (see bug #134371).
*/
if (private->quick_mask_state)
channel_was_active = (private->quick_mask_state & CHANNEL_WAS_ACTIVE) != 0;
else
channel_was_active = (gimp_image_get_selected_channels (image) != NULL);
/* Set private->quick_mask_state early so we can return early when
* being called recursively.
*/
private->quick_mask_state = (active
? TRUE | (channel_was_active ?
CHANNEL_WAS_ACTIVE : 0)
: FALSE);
private->quick_mask_state = active;
selection = gimp_image_get_mask (image);
mask = gimp_image_get_quick_mask (image);
if (active)
{
private->quick_mask_selected = gimp_image_get_selected_drawables (image);
if (! mask)
{
GimpLayer *floating_sel;
@ -115,7 +102,8 @@ gimp_image_set_quick_mask_state (GimpImage *image,
{
if (mask)
{
GimpLayer *floating_sel = gimp_image_get_floating_selection (image);
GimpLayer *floating_sel = gimp_image_get_floating_selection (image);
GType selected_type = GIMP_TYPE_LAYER;
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_QUICK_MASK,
C_("undo-type", "Disable Quick Mask"));
@ -134,11 +122,16 @@ gimp_image_set_quick_mask_state (GimpImage *image,
TRUE, FALSE, 0.0, 0.0);
gimp_image_remove_channel (image, mask, TRUE, NULL);
if (! channel_was_active)
gimp_image_unset_selected_channels (image);
if (private->quick_mask_selected)
selected_type = G_TYPE_FROM_INSTANCE (private->quick_mask_selected->data);
gimp_image_set_selected_items (image, selected_type,
private->quick_mask_selected);
gimp_image_undo_group_end (image);
}
g_clear_pointer (&private->quick_mask_selected, g_list_free);
}
gimp_image_quick_mask_changed (image);

7
app/core/gimpimage.c
View file

@ -1175,6 +1175,7 @@ gimp_image_finalize (GObject *object)
g_clear_object (&private->channels);
g_clear_object (&private->paths);
g_clear_object (&private->quick_mask_color);
g_clear_pointer (&private->quick_mask_selected, g_list_free);
if (private->layer_stack)
{
@ -4992,15 +4993,15 @@ gimp_image_set_selected_items (GimpImage *image,
{
g_return_if_fail (GIMP_IS_IMAGE (image));
if (item_type == GIMP_TYPE_LAYER)
if (g_type_is_a (item_type, GIMP_TYPE_LAYER))
{
gimp_image_set_selected_layers (image, items);
}
else if (item_type == GIMP_TYPE_CHANNEL)
else if (g_type_is_a (item_type, GIMP_TYPE_CHANNEL))
{
gimp_image_set_selected_channels (image, items);
}
else if (item_type == GIMP_TYPE_PATH)
else if (g_type_is_a (item_type, GIMP_TYPE_PATH))
{
gimp_image_set_selected_paths (image, items);
}