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

app: add gimp_draw_tool_add_item() and use it all over the place

Browse Source
This commit is contained in:
Michael Natterer
2010-09-25 11:19:00 +02:00
parent e89650edd9
commit 62f8f559a7
1 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
app/tools/gimpdrawtool.c
View File

@ -168,6 +168,24 @@ gimp_draw_tool_control (GimpTool *tool,
GIMP_TOOL_CLASS (parent_class)->control (tool, action, display); GIMP_TOOL_CLASS (parent_class)->control (tool, action, display);
} }
static void
gimp_draw_tool_add_item (GimpDrawTool *draw_tool,
GimpCanvasItem *item)
{
draw_tool->items = g_list_append (draw_tool->items, g_object_ref (item));
}
static void
gimp_draw_tool_clear_items (GimpDrawTool *draw_tool)
{
if (draw_tool->items)
{
g_list_foreach (draw_tool->items, (GFunc) g_object_unref, NULL);
g_list_free (draw_tool->items);
draw_tool->items = NULL;
}
}
static void static void
gimp_draw_tool_invalidate_items (GimpDrawTool *draw_tool) gimp_draw_tool_invalidate_items (GimpDrawTool *draw_tool)
{ {
@ -186,17 +204,6 @@ gimp_draw_tool_invalidate_items (GimpDrawTool *draw_tool)
} }
} }
static void
gimp_draw_tool_clear_items (GimpDrawTool *draw_tool)
{
if (draw_tool->items)
{
g_list_foreach (draw_tool->items, (GFunc) g_object_unref, NULL);
g_list_free (draw_tool->items);
draw_tool->items = NULL;
}
}
static void static void
gimp_draw_tool_draw (GimpDrawTool *draw_tool) gimp_draw_tool_draw (GimpDrawTool *draw_tool)
{ {
@ -422,7 +429,8 @@ gimp_draw_tool_draw_line (GimpDrawTool *draw_tool,
item = gimp_canvas_line_new (x1, y1, x2, y2); item = gimp_canvas_line_new (x1, y1, x2, y2);
draw_tool->items = g_list_append (draw_tool->items, item); gimp_draw_tool_add_item (draw_tool, item);
g_object_unref (item);
} }
/** /**
@ -451,7 +459,8 @@ gimp_draw_tool_draw_dashed_line (GimpDrawTool *draw_tool,
item = gimp_canvas_line_new (x1, y1, x2, y2); item = gimp_canvas_line_new (x1, y1, x2, y2);
gimp_canvas_item_set_highlight (item, TRUE); gimp_canvas_item_set_highlight (item, TRUE);
draw_tool->items = g_list_append (draw_tool->items, item); gimp_draw_tool_add_item (draw_tool, item);
g_object_unref (item);
} }
/** /**
@ -473,7 +482,8 @@ gimp_draw_tool_draw_guide_line (GimpDrawTool *draw_tool,
item = gimp_canvas_guide_new (orientation, position); item = gimp_canvas_guide_new (orientation, position);
draw_tool->items = g_list_append (draw_tool->items, item); gimp_draw_tool_add_item (draw_tool, item);
g_object_unref (item);
} }
/** /**
@ -502,7 +512,8 @@ gimp_draw_tool_draw_rectangle (GimpDrawTool *draw_tool,
item = gimp_canvas_rectangle_new (x, y, width, height, filled); item = gimp_canvas_rectangle_new (x, y, width, height, filled);
draw_tool->items = g_list_append (draw_tool->items, item); gimp_draw_tool_add_item (draw_tool, item);
g_object_unref (item);
} }
void void
@ -530,7 +541,8 @@ gimp_draw_tool_draw_arc (GimpDrawTool *draw_tool,
a1, a2, a1, a2,
FALSE); FALSE);
draw_tool->items = g_list_append (draw_tool->items, item); gimp_draw_tool_add_item (draw_tool, item);
g_object_unref (item);
} }
void void
@ -559,7 +571,8 @@ gimp_draw_tool_draw_arc_by_anchor (GimpDrawTool *draw_tool,
gimp_canvas_handle_set_angles (GIMP_CANVAS_HANDLE (item), a1, a2); gimp_canvas_handle_set_angles (GIMP_CANVAS_HANDLE (item), a1, a2);
draw_tool->items = g_list_append (draw_tool->items, item); gimp_draw_tool_add_item (draw_tool, item);
g_object_unref (item);
} }
void void
@ -577,7 +590,8 @@ gimp_draw_tool_draw_handle (GimpDrawTool *draw_tool,
item = gimp_canvas_handle_new (type, anchor, x, y, width, height); item = gimp_canvas_handle_new (type, anchor, x, y, width, height);
draw_tool->items = g_list_append (draw_tool->items, item); gimp_draw_tool_add_item (draw_tool, item);
g_object_unref (item);
} }
/** /**
@ -617,7 +631,8 @@ gimp_draw_tool_draw_corner (GimpDrawTool *draw_tool,
anchor, width, height, put_outside); anchor, width, height, put_outside);
gimp_canvas_item_set_highlight (item, highlight); gimp_canvas_item_set_highlight (item, highlight);
draw_tool->items = g_list_append (draw_tool->items, item); gimp_draw_tool_add_item (draw_tool, item);
g_object_unref (item);
} }
void void
@ -635,7 +650,8 @@ gimp_draw_tool_draw_lines (GimpDrawTool *draw_tool,
item = gimp_canvas_polygon_new (points, n_points, filled); item = gimp_canvas_polygon_new (points, n_points, filled);
draw_tool->items = g_list_append (draw_tool->items, item); gimp_draw_tool_add_item (draw_tool, item);
g_object_unref (item);
} }
void void
@ -653,7 +669,8 @@ gimp_draw_tool_draw_strokes (GimpDrawTool *draw_tool,
item = gimp_canvas_polygon_new_from_coords (points, n_points, filled); item = gimp_canvas_polygon_new_from_coords (points, n_points, filled);
draw_tool->items = g_list_append (draw_tool->items, item); gimp_draw_tool_add_item (draw_tool, item);
g_object_unref (item);
} }
/** /**
@ -685,7 +702,8 @@ gimp_draw_tool_draw_boundary (GimpDrawTool *draw_tool,
item = gimp_canvas_boundary_new (bound_segs, n_bound_segs, item = gimp_canvas_boundary_new (bound_segs, n_bound_segs,
offset_x, offset_y); offset_x, offset_y);
draw_tool->items = g_list_append (draw_tool->items, item); gimp_draw_tool_add_item (draw_tool, item);
g_object_unref (item);
} }
void void
@ -699,7 +717,8 @@ gimp_draw_tool_draw_text_cursor (GimpDrawTool *draw_tool,
item = gimp_canvas_text_cursor_new (cursor, overwrite); item = gimp_canvas_text_cursor_new (cursor, overwrite);
draw_tool->items = g_list_append (draw_tool->items, item); gimp_draw_tool_add_item (draw_tool, item);
g_object_unref (item);
} }
gboolean gboolean