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

changed GimpObject::get_memsize() to return a second value named

Browse Source 
2003-08-25  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpobject.[ch]: changed GimpObject::get_memsize() to
	return a second value named "gui_size", where the primary return
	value is the "constant" actual size (as long as no operation is
	performed on the object), and the second "gui_size" return value
	is the size of temporary stuff like preview caches or boundary
	segments (which may change asynchronously, even if the object is
	on the undo stack).

	* app/core/gimp.c
	* app/core/gimpbrush.c
	* app/core/gimpbrushpipe.c
	* app/core/gimpbuffer.c
	* app/core/gimpchannel.c
	* app/core/gimpcontainer.c
	* app/core/gimpcontext.c
	* app/core/gimpdata.c
	* app/core/gimpdatafactory.c
	* app/core/gimpdrawable.c
	* app/core/gimpgradient.c
	* app/core/gimpimage-undo.c
	* app/core/gimpimage.c
	* app/core/gimpitem.c
	* app/core/gimplayer.c
	* app/core/gimplist.c
	* app/core/gimppalette.c
	* app/core/gimpparasitelist.c
	* app/core/gimppattern.c
	* app/core/gimpundo.c
	* app/core/gimpundostack.c
	* app/core/gimpviewable.c
	* app/text/gimptextlayer.c
	* app/vectors/gimpstroke.c
	* app/vectors/gimpvectors.c: changed get_memsize() implementations
	accordingly.

	* app/display/gimpdisplayshell-title.c
	* app/gui/debug-commands.c
	* app/widgets/gimppreview.c: changed callers accordingly.

	* app/core/gimpimage-undo-push.c: changed layer, channel, vectors
	and layer_mask undo steps to add/subtract the size of the
	resp. objects whenever they take/drop ownership of them. Ignore
	the objects' "gui_size" to get identical sizes on
	adding/subtracting. Fixes bug #120429.
This commit is contained in:
Michael Natterer
2003-08-25 10:49:33 +00:00
committed by Michael Natterer
parent 72369061b6
commit 24f3da165b
39 changed files with 624 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/core/gimpundostack.c
View File

@ -33,7 +33,8 @@ static void gimp_undo_stack_init (GimpUndoStack *stack);
static void gimp_undo_stack_finalize (GObject *object);
static gsize gimp_undo_stack_get_memsize (GimpObject *object);
static gsize gimp_undo_stack_get_memsize (GimpObject *object,
gsize *gui_size);
static void gimp_undo_stack_pop (GimpUndo *undo,
GimpUndoMode undo_mode,
@ -66,7 +67,7 @@ gimp_undo_stack_get_type (void)
};
undo_stack_type = g_type_register_static (GIMP_TYPE_UNDO,
"GimpUndoStack",
"GimpUndoStack",
&undo_stack_info, 0);
}
@ -118,7 +119,8 @@ gimp_undo_stack_finalize (GObject *object)
}
static gsize
gimp_undo_stack_get_memsize (GimpObject *object)
gimp_undo_stack_get_memsize (GimpObject *object,
gsize *gui_size)
{
GimpUndoStack *stack;
gsize memsize = 0;
@ -126,9 +128,10 @@ gimp_undo_stack_get_memsize (GimpObject *object)
stack = GIMP_UNDO_STACK (object);
if (stack->undos)
memsize += gimp_object_get_memsize (GIMP_OBJECT (stack->undos));
memsize += gimp_object_get_memsize (GIMP_OBJECT (stack->undos), gui_size);
return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object);
return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
gui_size);
}
static void
@ -193,8 +196,8 @@ gimp_undo_stack_new (GimpImage *gimage)
return stack;
}
void
gimp_undo_stack_push_undo (GimpUndoStack *stack,
void
gimp_undo_stack_push_undo (GimpUndoStack *stack,
GimpUndo *undo)
{
g_return_if_fail (GIMP_IS_UNDO_STACK (stack));
@ -203,7 +206,7 @@ gimp_undo_stack_push_undo (GimpUndoStack *stack,
gimp_container_add (GIMP_CONTAINER (stack->undos), GIMP_OBJECT (undo));
}
GimpUndo *
GimpUndo *
gimp_undo_stack_pop_undo (GimpUndoStack *stack,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum)
@ -223,7 +226,7 @@ gimp_undo_stack_pop_undo (GimpUndoStack *stack,
return undo;
}
return NULL;
}
@ -253,7 +256,7 @@ gimp_undo_stack_free_bottom (GimpUndoStack *stack,
return NULL;
}
GimpUndo *
GimpUndo *
gimp_undo_stack_peek (GimpUndoStack *stack)
{
GimpObject *object;