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

app: change GimpCanvasItem setters to take GimpCanvasItem*

Browse Source 
not GimpCanvasLine* etc. We keep them around as items, and their
constructors return items, and it's getting more code anyway when
porting away from pause/resume, so let's keep the casting minimal at
least.
This commit is contained in:
Michael Natterer
2011-03-28 12:20:36 +02:00
parent aa5d2f8082
commit accc12a3ca
6 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/display/gimpcanvashandle.c
View File

@ -403,35 +403,35 @@ gimp_canvas_handle_new (GimpDisplayShell *shell,
} }
void void
gimp_canvas_handle_set_position (GimpCanvasHandle *handle, gimp_canvas_handle_set_position (GimpCanvasItem *handle,
gdouble x, gdouble x,
gdouble y) gdouble y)
{ {
g_return_if_fail (GIMP_IS_CANVAS_HANDLE (handle)); g_return_if_fail (GIMP_IS_CANVAS_HANDLE (handle));
gimp_canvas_item_begin_change (GIMP_CANVAS_ITEM (handle)); gimp_canvas_item_begin_change (handle);
g_object_set (handle, g_object_set (handle,
"x", x, "x", x,
"y", y, "y", y,
NULL); NULL);
gimp_canvas_item_end_change (GIMP_CANVAS_ITEM (handle)); gimp_canvas_item_end_change (handle);
} }
void void
gimp_canvas_handle_set_angles (GimpCanvasHandle *handle, gimp_canvas_handle_set_angles (GimpCanvasItem *handle,
gdouble start_angle, gdouble start_angle,
gdouble slice_angle) gdouble slice_angle)
{ {
g_return_if_fail (GIMP_IS_CANVAS_HANDLE (handle)); g_return_if_fail (GIMP_IS_CANVAS_HANDLE (handle));
gimp_canvas_item_begin_change (GIMP_CANVAS_ITEM (handle)); gimp_canvas_item_begin_change (handle);
g_object_set (handle, g_object_set (handle,
"start-angle", start_angle, "start-angle", start_angle,
"slice-angle", slice_angle, "slice-angle", slice_angle,
NULL); NULL);
gimp_canvas_item_end_change (GIMP_CANVAS_ITEM (handle)); gimp_canvas_item_end_change (handle);
} }

4
app/display/gimpcanvashandle.h
View File

@ -57,10 +57,10 @@ GimpCanvasItem * gimp_canvas_handle_new (GimpDisplayShell *shell,
gint width, gint width,
gint height); gint height);
void gimp_canvas_handle_set_position (GimpCanvasHandle *handle, void gimp_canvas_handle_set_position (GimpCanvasItem *handle,
gdouble x, gdouble x,
gdouble y); gdouble y);
void gimp_canvas_handle_set_angles (GimpCanvasHandle *handle, void gimp_canvas_handle_set_angles (GimpCanvasItem *handle,
gdouble start_handle, gdouble start_handle,
gdouble slice_handle); gdouble slice_handle);

6
app/display/gimpcanvasline.c
View File

@ -269,7 +269,7 @@ gimp_canvas_line_new (GimpDisplayShell *shell,
} }
void void
gimp_canvas_line_set (GimpCanvasLine *line, gimp_canvas_line_set (GimpCanvasItem *line,
gdouble x1, gdouble x1,
gdouble y1, gdouble y1,
gdouble x2, gdouble x2,
@ -277,7 +277,7 @@ gimp_canvas_line_set (GimpCanvasLine *line,
{ {
g_return_if_fail (GIMP_IS_CANVAS_LINE (line)); g_return_if_fail (GIMP_IS_CANVAS_LINE (line));
gimp_canvas_item_begin_change (GIMP_CANVAS_ITEM (line)); gimp_canvas_item_begin_change (line);
g_object_set (line, g_object_set (line,
"x1", x1, "x1", x1,
@ -286,5 +286,5 @@ gimp_canvas_line_set (GimpCanvasLine *line,
"y2", y2, "y2", y2,
NULL); NULL);
gimp_canvas_item_end_change (GIMP_CANVAS_ITEM (line)); gimp_canvas_item_end_change (line);
} }

2
app/display/gimpcanvasline.h
View File

@ -55,7 +55,7 @@ GimpCanvasItem * gimp_canvas_line_new (GimpDisplayShell *shell,
gdouble x2, gdouble x2,
gdouble y2); gdouble y2);
void gimp_canvas_line_set (GimpCanvasLine *line, void gimp_canvas_line_set (GimpCanvasItem *line,
gdouble x1, gdouble x1,
gdouble y1, gdouble y1,
gdouble x2, gdouble x2,

4
app/tools/gimpblendtool.c
View File

@ -409,12 +409,12 @@ gimp_blend_tool_update_items (GimpBlendTool *blend_tool)
{ {
if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (blend_tool))) if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (blend_tool)))
{ {
gimp_canvas_line_set (GIMP_CANVAS_LINE (blend_tool->line), gimp_canvas_line_set (blend_tool->line,
blend_tool->start_x, blend_tool->start_x,
blend_tool->start_y, blend_tool->start_y,
blend_tool->end_x, blend_tool->end_x,
blend_tool->end_y); blend_tool->end_y);
gimp_canvas_handle_set_position (GIMP_CANVAS_HANDLE (blend_tool->end_handle), gimp_canvas_handle_set_position (blend_tool->end_handle,
blend_tool->end_x, blend_tool->end_x,
blend_tool->end_y); blend_tool->end_y);
} }

3
app/tools/gimpmeasuretool.c
View File

@ -737,8 +737,7 @@ gimp_measure_tool_draw (GimpDrawTool *draw_tool)
ARC_RADIUS * 2 + 1, ARC_RADIUS * 2 + 1,
GIMP_HANDLE_ANCHOR_CENTER); GIMP_HANDLE_ANCHOR_CENTER);
gimp_canvas_handle_set_angles (GIMP_CANVAS_HANDLE (item), gimp_canvas_handle_set_angles (item, angle1, angle2);
angle1, angle2);
if (measure->num_points == 2) if (measure->num_points == 2)
{ {