dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: GimpCanvasLayerBoundary to show all selected layers area. 

I am currently unsure of this one. Since GimpCanvasLayerBoundary is a
GimpCanvasRectangle, it now shows the minimum rectangular boundary
containing all selected layers.

Should we instead show all individual layers boundary? I didn't choose
this because it would make the whole canvas much more messy, and also I
figure that layer boundaries are mostly used to get an idea of your
current working space extent, for instance if we were to resize the
canvas. Matter to discuss, I guess.
This commit is contained in:
Jehan 2020-05-07 16:13:08 +02:00
parent e3094b4c86
commit 83d8fcdd06
4 changed files with 158 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
app/display/gimpcanvaslayerboundary.c
View File

@ -40,7 +40,7 @@
enum enum
{ {
PROP_0, PROP_0,
PROP_LAYER, PROP_LAYERS,
PROP_EDIT_MASK PROP_EDIT_MASK
}; };
@ -49,7 +49,7 @@ typedef struct _GimpCanvasLayerBoundaryPrivate GimpCanvasLayerBoundaryPrivate;
struct _GimpCanvasLayerBoundaryPrivate struct _GimpCanvasLayerBoundaryPrivate
{ {
GimpLayer *layer; GList *layers;
gboolean edit_mask; gboolean edit_mask;
}; };
@ -95,9 +95,8 @@ gimp_canvas_layer_boundary_class_init (GimpCanvasLayerBoundaryClass *klass)
item_class->get_extents = gimp_canvas_layer_boundary_get_extents; item_class->get_extents = gimp_canvas_layer_boundary_get_extents;
item_class->stroke = gimp_canvas_layer_boundary_stroke; item_class->stroke = gimp_canvas_layer_boundary_stroke;
g_object_class_install_property (object_class, PROP_LAYER, g_object_class_install_property (object_class, PROP_LAYERS,
g_param_spec_object ("layer", NULL, NULL, g_param_spec_pointer ("layers", NULL, NULL,
GIMP_TYPE_LAYER,
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, PROP_EDIT_MASK, g_object_class_install_property (object_class, PROP_EDIT_MASK,
@ -116,9 +115,17 @@ gimp_canvas_layer_boundary_finalize (GObject *object)
{ {
GimpCanvasLayerBoundaryPrivate *private = GET_PRIVATE (object); GimpCanvasLayerBoundaryPrivate *private = GET_PRIVATE (object);
if (private->layer) if (private->layers)
g_object_remove_weak_pointer (G_OBJECT (private->layer), {
(gpointer) &private->layer); GList *iter;
for (iter = private->layers; iter; iter = iter->next)
if (iter->data)
g_object_remove_weak_pointer (G_OBJECT (iter->data),
(gpointer) &iter->data);
g_list_free (private->layers);
}
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
@ -133,14 +140,26 @@ gimp_canvas_layer_boundary_set_property (GObject *object,
switch (property_id) switch (property_id)
{ {
case PROP_LAYER: case PROP_LAYERS:
if (private->layer) if (private->layers)
g_object_remove_weak_pointer (G_OBJECT (private->layer), {
(gpointer) &private->layer); GList *iter;
private->layer = g_value_get_object (value); /* don't ref */ for (iter = private->layers; iter; iter = iter->next)
if (private->layer) {
g_object_add_weak_pointer (G_OBJECT (private->layer), if (iter->data)
(gpointer) &private->layer); g_object_remove_weak_pointer (G_OBJECT (iter->data),
(gpointer) &iter->data);
}
g_list_free (private->layers);
}
private->layers = g_list_copy (g_value_get_pointer (value));
if (private->layers)
{
GList *iter;
for (iter = private->layers; iter; iter = iter->next)
g_object_add_weak_pointer (G_OBJECT (iter->data),
(gpointer) &iter->data);
}
break; break;
case PROP_EDIT_MASK: case PROP_EDIT_MASK:
private->edit_mask = g_value_get_boolean (value); private->edit_mask = g_value_get_boolean (value);
@ -162,8 +181,8 @@ gimp_canvas_layer_boundary_get_property (GObject *object,
switch (property_id) switch (property_id)
{ {
case PROP_LAYER: case PROP_LAYERS:
g_value_set_object (value, private->layer); g_value_set_pointer (value, private->layers);
break; break;
case PROP_EDIT_MASK: case PROP_EDIT_MASK:
g_value_set_boolean (value, private->edit_mask); g_value_set_boolean (value, private->edit_mask);
@ -181,7 +200,7 @@ gimp_canvas_layer_boundary_draw (GimpCanvasItem *item,
{ {
GimpCanvasLayerBoundaryPrivate *private = GET_PRIVATE (item); GimpCanvasLayerBoundaryPrivate *private = GET_PRIVATE (item);
if (private->layer) if (private->layers)
GIMP_CANVAS_ITEM_CLASS (parent_class)->draw (item, cr); GIMP_CANVAS_ITEM_CLASS (parent_class)->draw (item, cr);
} }
@ -190,7 +209,7 @@ gimp_canvas_layer_boundary_get_extents (GimpCanvasItem *item)
{ {
GimpCanvasLayerBoundaryPrivate *private = GET_PRIVATE (item); GimpCanvasLayerBoundaryPrivate *private = GET_PRIVATE (item);
if (private->layer) if (private->layers)
return GIMP_CANVAS_ITEM_CLASS (parent_class)->get_extents (item); return GIMP_CANVAS_ITEM_CLASS (parent_class)->get_extents (item);
return NULL; return NULL;
@ -202,12 +221,15 @@ gimp_canvas_layer_boundary_stroke (GimpCanvasItem *item,
{ {
GimpCanvasLayerBoundaryPrivate *private = GET_PRIVATE (item); GimpCanvasLayerBoundaryPrivate *private = GET_PRIVATE (item);
GimpDisplayShell *shell = gimp_canvas_item_get_shell (item); GimpDisplayShell *shell = gimp_canvas_item_get_shell (item);
GList *iter;
for (iter = private->layers; iter; iter = iter->next)
{
gimp_canvas_set_layer_style (gimp_canvas_item_get_canvas (item), cr, gimp_canvas_set_layer_style (gimp_canvas_item_get_canvas (item), cr,
private->layer, iter->data, shell->offset_x, shell->offset_y);
shell->offset_x, shell->offset_y);
cairo_stroke (cr); cairo_stroke (cr);
} }
}
GimpCanvasItem * GimpCanvasItem *
gimp_canvas_layer_boundary_new (GimpDisplayShell *shell) gimp_canvas_layer_boundary_new (GimpDisplayShell *shell)
@ -220,78 +242,110 @@ gimp_canvas_layer_boundary_new (GimpDisplayShell *shell)
} }
void void
gimp_canvas_layer_boundary_set_layer (GimpCanvasLayerBoundary *boundary, gimp_canvas_layer_boundary_set_layers (GimpCanvasLayerBoundary *boundary,
GimpLayer *layer) GList *layers)
{ {
GimpCanvasLayerBoundaryPrivate *private; GimpCanvasLayerBoundaryPrivate *private;
GList *shown_layers;
GList *iter;
gboolean changed;
g_return_if_fail (GIMP_IS_CANVAS_LAYER_BOUNDARY (boundary)); g_return_if_fail (GIMP_IS_CANVAS_LAYER_BOUNDARY (boundary));
g_return_if_fail (layer == NULL || GIMP_IS_LAYER (layer));
private = GET_PRIVATE (boundary); private = GET_PRIVATE (boundary);
if (layer && gimp_layer_is_floating_sel (layer)) if (g_list_length (layers) == 1 && gimp_layer_is_floating_sel (layers->data))
{ {
GimpDrawable *drawable; GimpDrawable *drawable;
drawable = gimp_layer_get_floating_sel_drawable (layer); drawable = gimp_layer_get_floating_sel_drawable (layers->data);
if (GIMP_IS_CHANNEL (drawable)) if (GIMP_IS_CHANNEL (drawable))
{ {
/* if the owner drawable is a channel, show no outline */ /* if the owner drawable is a channel, show no outline */
layer = NULL; shown_layers = NULL;
} }
else else
{ {
/* otherwise, set the layer to the owner drawable */ /* otherwise, set the layer to the owner drawable */
layer = GIMP_LAYER (drawable); shown_layers = g_list_prepend (NULL, GIMP_LAYER (drawable));
}
}
else
{
shown_layers = g_list_copy (layers);
}
changed = (g_list_length (shown_layers) != g_list_length (private->layers));
if (! changed)
{
for (iter = shown_layers; iter; iter = iter->next)
{
if (! g_list_find (private->layers, iter->data))
{
changed = TRUE;
break;
}
} }
} }
if (layer != private->layer) if (changed)
{ {
gboolean edit_mask = FALSE; gboolean edit_mask = FALSE;
gint x1 = G_MAXINT;
gint x2 = G_MININT;
gint y1 = G_MAXINT;
gint y2 = G_MININT;
for (iter = layers; iter; iter = iter->next)
{
if (iter->data)
{
GimpItem *item = GIMP_ITEM (iter->data);
x1 = MIN (x1, gimp_item_get_offset_x (item));
y1 = MIN (y1, gimp_item_get_offset_y (item));
x2 = MAX (x2,
gimp_item_get_offset_x (item) +
gimp_item_get_width (item));
y2 = MAX (y2,
gimp_item_get_offset_y (item) +
gimp_item_get_height (item));
/* We can only edit one layer mask at a time. */
if (gimp_layer_get_mask (iter->data) &&
gimp_layer_get_edit_mask (iter->data))
edit_mask = TRUE;
}
}
gimp_canvas_item_begin_change (GIMP_CANVAS_ITEM (boundary)); gimp_canvas_item_begin_change (GIMP_CANVAS_ITEM (boundary));
if (layer) if (layers)
{
GimpItem *item = GIMP_ITEM (layer);
edit_mask = (gimp_layer_get_mask (layer) &&
gimp_layer_get_edit_mask (layer));
g_object_set (boundary, g_object_set (boundary,
"x", (gdouble) gimp_item_get_offset_x (item), "x", (gdouble) x1,
"y", (gdouble) gimp_item_get_offset_y (item), "y", (gdouble) y1,
"width", (gdouble) gimp_item_get_width (item), "width", (gdouble) (x2 - x1),
"height", (gdouble) gimp_item_get_height (item), "height", (gdouble) (y2 - y1),
NULL); NULL);
}
g_object_set (boundary, g_object_set (boundary,
"layer", layer, "layers", layers,
"edit-mask", edit_mask, "edit-mask", edit_mask,
NULL); NULL);
gimp_canvas_item_end_change (GIMP_CANVAS_ITEM (boundary)); gimp_canvas_item_end_change (GIMP_CANVAS_ITEM (boundary));
} }
else if (layer && layer == private->layer) else if (layers)
{ {
GimpItem *item = GIMP_ITEM (layer); gboolean edit_mask = FALSE;
gint lx, ly, lw, lh; gint x1 = G_MAXINT;
gint x2 = G_MININT;
gint y1 = G_MAXINT;
gint y2 = G_MININT;
gdouble x, y, w, h; gdouble x, y, w, h;
gboolean edit_mask;
lx = gimp_item_get_offset_x (item);
ly = gimp_item_get_offset_y (item);
lw = gimp_item_get_width (item);
lh = gimp_item_get_height (item);
edit_mask = (gimp_layer_get_mask (layer) &&
gimp_layer_get_edit_mask (layer));
g_object_get (boundary, g_object_get (boundary,
"x", &x, "x", &x,
@ -300,23 +354,46 @@ gimp_canvas_layer_boundary_set_layer (GimpCanvasLayerBoundary *boundary,
"height", &h, "height", &h,
NULL); NULL);
if (lx != (gint) x || for (iter = layers; iter; iter = iter->next)
ly != (gint) y || {
lw != (gint) w || if (iter->data)
lh != (gint) h || {
GimpItem *item = GIMP_ITEM (iter->data);
x1 = MIN (x1, gimp_item_get_offset_x (item));
y1 = MIN (y1, gimp_item_get_offset_y (item));
x2 = MAX (x2,
gimp_item_get_offset_x (item) +
gimp_item_get_width (item));
y2 = MAX (y2,
gimp_item_get_offset_y (item) +
gimp_item_get_height (item));
if (gimp_layer_get_mask (iter->data) &&
gimp_layer_get_edit_mask (iter->data))
edit_mask = TRUE;
}
}
if (x1 != (gint) x ||
x1 != (gint) y ||
(x2 - x1) != (gint) w ||
(y2 - y1) != (gint) h ||
edit_mask != private->edit_mask) edit_mask != private->edit_mask)
{ {
gimp_canvas_item_begin_change (GIMP_CANVAS_ITEM (boundary)); gimp_canvas_item_begin_change (GIMP_CANVAS_ITEM (boundary));
g_object_set (boundary, g_object_set (boundary,
"x", (gdouble) lx, "x", (gdouble) x1,
"y", (gdouble) ly, "y", (gdouble) y1,
"width", (gdouble) lw, "width", (gdouble) (x2 - x1),
"height", (gdouble) lh, "height", (gdouble) (y2 - y1),
"edit-mask", edit_mask, "edit-mask", edit_mask,
NULL); NULL);
gimp_canvas_item_end_change (GIMP_CANVAS_ITEM (boundary)); gimp_canvas_item_end_change (GIMP_CANVAS_ITEM (boundary));
} }
} }
g_list_free (shown_layers);
} }

4
app/display/gimpcanvaslayerboundary.h
View File

@ -51,8 +51,8 @@ GType gimp_canvas_layer_boundary_get_type (void) G_GNUC_CONST;
GimpCanvasItem * gimp_canvas_layer_boundary_new (GimpDisplayShell *shell); GimpCanvasItem * gimp_canvas_layer_boundary_new (GimpDisplayShell *shell);
void gimp_canvas_layer_boundary_set_layer (GimpCanvasLayerBoundary *boundary, void gimp_canvas_layer_boundary_set_layers (GimpCanvasLayerBoundary *boundary,
GimpLayer *layer); GList *layers);
#endif /* __GIMP_CANVAS_LAYER_BOUNDARY_H__ */ #endif /* __GIMP_CANVAS_LAYER_BOUNDARY_H__ */

6
app/display/gimpdisplayshell-handlers.c
View File

@ -403,8 +403,8 @@ gimp_display_shell_connect (GimpDisplayShell *shell)
NULL, /* sync all */ NULL, /* sync all */
shell); shell);
gimp_canvas_layer_boundary_set_layer (GIMP_CANVAS_LAYER_BOUNDARY (shell->layer_boundary), gimp_canvas_layer_boundary_set_layers (GIMP_CANVAS_LAYER_BOUNDARY (shell->layer_boundary),
gimp_image_get_active_layer (image)); gimp_image_get_selected_layers (image));
gimp_canvas_canvas_boundary_set_image (GIMP_CANVAS_CANVAS_BOUNDARY (shell->canvas_boundary), gimp_canvas_canvas_boundary_set_image (GIMP_CANVAS_CANVAS_BOUNDARY (shell->canvas_boundary),
image); image);
@ -443,7 +443,7 @@ gimp_display_shell_disconnect (GimpDisplayShell *shell)
gimp_display_shell_icon_update_stop (shell); gimp_display_shell_icon_update_stop (shell);
gimp_canvas_layer_boundary_set_layer (GIMP_CANVAS_LAYER_BOUNDARY (shell->layer_boundary), gimp_canvas_layer_boundary_set_layers (GIMP_CANVAS_LAYER_BOUNDARY (shell->layer_boundary),
NULL); NULL);
gimp_canvas_canvas_boundary_set_image (GIMP_CANVAS_CANVAS_BOUNDARY (shell->canvas_boundary), gimp_canvas_canvas_boundary_set_image (GIMP_CANVAS_CANVAS_BOUNDARY (shell->canvas_boundary),

4
app/display/gimpdisplayshell.c
View File

@ -1916,8 +1916,8 @@ gimp_display_shell_flush (GimpDisplayShell *shell)
gimp_display_shell_title_update (shell); gimp_display_shell_title_update (shell);
gimp_canvas_layer_boundary_set_layer (GIMP_CANVAS_LAYER_BOUNDARY (shell->layer_boundary), gimp_canvas_layer_boundary_set_layers (GIMP_CANVAS_LAYER_BOUNDARY (shell->layer_boundary),
gimp_image_get_active_layer (gimp_display_get_image (shell->display))); gimp_image_get_selected_layers (gimp_display_get_image (shell->display)));
gimp_canvas_canvas_boundary_set_image (GIMP_CANVAS_CANVAS_BOUNDARY (shell->canvas_boundary), gimp_canvas_canvas_boundary_set_image (GIMP_CANVAS_CANVAS_BOUNDARY (shell->canvas_boundary),
gimp_display_get_image (shell->display)); gimp_display_get_image (shell->display));