From d7f53de7a19a00bf0f01f4824498ae64d9cd12a6 Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Sat, 16 Jan 2016 11:13:25 -0500 Subject: Coalesce g_object_new/g_object_set calls; change guide origin pickable to false so that guides can be grabbed by the origin again (bzr r14593) --- src/display/guideline.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/display/guideline.cpp b/src/display/guideline.cpp index d34112046..126fcf87c 100644 --- a/src/display/guideline.cpp +++ b/src/display/guideline.cpp @@ -218,12 +218,13 @@ SPCanvasItem *sp_guideline_new(SPCanvasGroup *parent, char* label, Geom::Point p gl->angle = tan( -gl->normal_to_line[Geom::X] / gl->normal_to_line[Geom::Y]); sp_guideline_set_position(gl, point_on_line); - gl->origin = (SPCtrl *)sp_canvas_item_new(parent, SP_TYPE_CTRL, NULL); - g_object_set(G_OBJECT(gl->origin), "anchor", SP_ANCHOR_CENTER, - "mode", SP_CTRL_MODE_COLOR, - "filled", FALSE, - "stroked", TRUE, - "stroke_color", 0x01000000, NULL); + gl->origin = (SPCtrl *) sp_canvas_item_new(parent, SP_TYPE_CTRL, + "anchor", SP_ANCHOR_CENTER, + "mode", SP_CTRL_MODE_COLOR, + "filled", FALSE, + "stroked", TRUE, + "stroke_color", 0x01000000, NULL); + gl->origin->pickable = false; return item; } -- cgit v1.2.3