callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: fake the size of a gruop layer by overriding GimpViewable::get_size()

Browse Source 
instead of messing with GimpItem's width and height members.
This commit is contained in:
Michael Natterer
2011-03-08 18:04:23 +01:00
parent 5bd1b318af
commit f7ce31d62f
1 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
app/core/gimpgrouplayer.c
View File

@ -51,6 +51,11 @@ struct _GimpGroupLayerPrivate
GeglNode *graph; GeglNode *graph;
GeglNode *offset_node; GeglNode *offset_node;
gint suspend_resize; gint suspend_resize;
/* hackish temp states to make the projection/tiles stuff work */
gboolean reallocate_projection;
gint reallocate_width;
gint reallocate_height;
}; };
#define GET_PRIVATE(item) G_TYPE_INSTANCE_GET_PRIVATE (item, \ #define GET_PRIVATE(item) G_TYPE_INSTANCE_GET_PRIVATE (item, \
@ -73,6 +78,9 @@ static void gimp_group_layer_get_property (GObject *object,
static gint64 gimp_group_layer_get_memsize (GimpObject *object, static gint64 gimp_group_layer_get_memsize (GimpObject *object,
gint64 *gui_size); gint64 *gui_size);
static gboolean gimp_group_layer_get_size (GimpViewable *viewable,
gint *width,
gint *height);
static GimpContainer * gimp_group_layer_get_children (GimpViewable *viewable); static GimpContainer * gimp_group_layer_get_children (GimpViewable *viewable);
static GimpItem * gimp_group_layer_duplicate (GimpItem *item, static GimpItem * gimp_group_layer_duplicate (GimpItem *item,
@ -180,6 +188,7 @@ gimp_group_layer_class_init (GimpGroupLayerClass *klass)
gimp_object_class->get_memsize = gimp_group_layer_get_memsize; gimp_object_class->get_memsize = gimp_group_layer_get_memsize;
viewable_class->default_stock_id = "gtk-directory"; viewable_class->default_stock_id = "gtk-directory";
viewable_class->get_size = gimp_group_layer_get_size;
viewable_class->get_children = gimp_group_layer_get_children; viewable_class->get_children = gimp_group_layer_get_children;
item_class->duplicate = gimp_group_layer_duplicate; item_class->duplicate = gimp_group_layer_duplicate;
@ -332,6 +341,25 @@ gimp_group_layer_get_memsize (GimpObject *object,
gui_size); gui_size);
} }
static gboolean
gimp_group_layer_get_size (GimpViewable *viewable,
gint *width,
gint *height)
{
GimpGroupLayerPrivate *private = GET_PRIVATE (viewable);
if (private->reallocate_width != 0 &&
private->reallocate_height != 0)
{
*width = private->reallocate_width;
*height = private->reallocate_height;
return TRUE;
}
return GIMP_VIEWABLE_CLASS (parent_class)->get_size (viewable, width, height);
}
static GimpContainer * static GimpContainer *
gimp_group_layer_get_children (GimpViewable *viewable) gimp_group_layer_get_children (GimpViewable *viewable)
{ {
@ -391,10 +419,8 @@ gimp_group_layer_duplicate (GimpItem *item,
position++); position++);
} }
/* FIXME: need to change the item's extents to resume_resize() /* force the projection to reallocate itself */
* will actually reallocate the projection's pyramid GET_PRIVATE (new_group)->reallocate_projection = TRUE;
*/
GIMP_ITEM (new_group)->width++;
gimp_group_layer_resume_resize (new_group, FALSE); gimp_group_layer_resume_resize (new_group, FALSE);
} }
@ -1012,34 +1038,33 @@ gimp_group_layer_update_size (GimpGroupLayer *group)
} }
} }
if (x != old_x || if (private->reallocate_projection ||
y != old_y || x != old_x ||
width != old_width || y != old_y ||
width != old_width ||
height != old_height) height != old_height)
{ {
if (width != old_width || if (private->reallocate_projection ||
width != old_width ||
height != old_height) height != old_height)
{ {
TileManager *tiles; TileManager *tiles;
/* FIXME: find a better way to do this: need to set the item's private->reallocate_projection = FALSE;
* extents to the new values so the projection will create
* its tiles with the right size /* temporarily change the return values of gimp_viewable_get_size()
* so the projection allocates itself correctly
*/ */
item->width = width; private->reallocate_width = width;
item->height = height; private->reallocate_height = height;
gimp_projectable_structure_changed (GIMP_PROJECTABLE (group)); gimp_projectable_structure_changed (GIMP_PROJECTABLE (group));
tiles = gimp_projection_get_tiles_at_level (private->projection, tiles = gimp_projection_get_tiles_at_level (private->projection,
0, NULL); 0, NULL);
/* FIXME: need to set the item's extents back to the old private->reallocate_width = 0;
* values so gimp_drawable_set_tiles_full() will emit all private->reallocate_height = 0;
* signals needed by the layer tree to update itself
*/
item->width = old_width;
item->height = old_height;
gimp_drawable_set_tiles_full (GIMP_DRAWABLE (group), gimp_drawable_set_tiles_full (GIMP_DRAWABLE (group),
FALSE, NULL, FALSE, NULL,