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

Move the base GeglNode here in preparation for moving the GimpLayer

Browse Source 
* app/core/gimpitem.[ch]: Move the base GeglNode here in
preparation for moving the GimpLayer gegl:shift op to here as
well. After all, the offsets are properties of GimpItem and not
GimpLayer.

* app/core/gimpdrawable.[ch]: Delegate appropriate stuff to the
GimpItem base class, like part of the visibility toggling and the
creation and destruction of the GimpItem node.

* app/core/gimplayer.c
* app/core/gimpchannel.c
* app/core/gimpdrawablestack.c: Changed accordingly, use the new
function names.

* app/core/gimpitempropundo.c
* app/vectors/gimpvectors-warp.c
* app/vectors/gimpvectorsmodundo.c: Include gegl.h instead of
glib-object.h

svn path=/trunk/; revision=27521
This commit is contained in:
Martin Nordholts
2008-11-02 16:39:38 +00:00
parent b66bad37a6
commit 24fac1de0f
11 changed files with 135 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/core/gimpdrawablestack.c
View File

@ -120,7 +120,7 @@ gimp_drawable_stack_remove (GimpContainer *container,
gimp_drawable_stack_remove_node (stack, GIMP_DRAWABLE (object));
gegl_node_remove_child (stack->graph,
gimp_drawable_get_node (GIMP_DRAWABLE (object)));
gimp_item_get_node (GIMP_ITEM (object)));
}
GIMP_CONTAINER_CLASS (parent_class)->remove (container, object);
@ -185,7 +185,7 @@ gimp_drawable_stack_get_graph (GimpDrawableStack *stack)
for (list = reverse_list; list; list = g_list_next (list))
{
GimpDrawable *drawable = list->data;
GeglNode *node = gimp_drawable_get_node (drawable);
GeglNode *node = gimp_item_get_node (GIMP_ITEM (drawable));
gegl_node_add_child (stack->graph, node);
@ -219,7 +219,7 @@ gimp_drawable_stack_add_node (GimpDrawableStack *stack,
GeglNode *node;
gint index;
node = gimp_drawable_get_node (drawable);
node = gimp_item_get_node (GIMP_ITEM (drawable));
index = gimp_container_get_child_index (GIMP_CONTAINER (stack),
GIMP_OBJECT (drawable));
@ -235,7 +235,7 @@ gimp_drawable_stack_add_node (GimpDrawableStack *stack,
drawable_above = (GimpDrawable *)
gimp_container_get_child_by_index (GIMP_CONTAINER (stack), index - 1);
node_above = gimp_drawable_get_node (drawable_above);
node_above = gimp_item_get_node (GIMP_ITEM (drawable_above));
}
gegl_node_connect_to (node, "output",
@ -246,7 +246,7 @@ gimp_drawable_stack_add_node (GimpDrawableStack *stack,
if (drawable_below)
{
GeglNode *node_below = gimp_drawable_get_node (drawable_below);
GeglNode *node_below = gimp_item_get_node (GIMP_ITEM (drawable_below));
gegl_node_connect_to (node_below, "output",
node, "input");
@ -262,7 +262,7 @@ gimp_drawable_stack_remove_node (GimpDrawableStack *stack,
GeglNode *node;
gint index;
node = gimp_drawable_get_node (drawable);
node = gimp_item_get_node (GIMP_ITEM (drawable));
index = gimp_container_get_child_index (GIMP_CONTAINER (stack),
GIMP_OBJECT (drawable));
@ -278,7 +278,7 @@ gimp_drawable_stack_remove_node (GimpDrawableStack *stack,
drawable_above = (GimpDrawable *)
gimp_container_get_child_by_index (GIMP_CONTAINER (stack), index - 1);
node_above = gimp_drawable_get_node (drawable_above);
node_above = gimp_item_get_node (GIMP_ITEM (drawable_above));
}
drawable_below = (GimpDrawable *)
@ -286,7 +286,7 @@ gimp_drawable_stack_remove_node (GimpDrawableStack *stack,
if (drawable_below)
{
GeglNode *node_below = gimp_drawable_get_node (drawable_below);
GeglNode *node_below = gimp_item_get_node (GIMP_ITEM (drawable_below));
gegl_node_disconnect (node, "input");
gegl_node_connect_to (node_below, "output",