summaryrefslogtreecommitdiffstats
path: root/src/display/guideline.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2016-01-16 16:13:25 +0000
committerLiam P. White <inkscapebrony@gmail.com>2016-01-16 16:13:25 +0000
commitd7f53de7a19a00bf0f01f4824498ae64d9cd12a6 (patch)
treebe1ecae42347c372f9abf6b06d764b6f9109cf8b /src/display/guideline.cpp
parentMerge branch fix-1526701 (diff)
downloadinkscape-d7f53de7a19a00bf0f01f4824498ae64d9cd12a6.tar.gz
inkscape-d7f53de7a19a00bf0f01f4824498ae64d9cd12a6.zip
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)
Diffstat (limited to 'src/display/guideline.cpp')
-rw-r--r--src/display/guideline.cpp13
1 files 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;
}