summaryrefslogtreecommitdiffstats
path: root/src/sp-guide.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2017-12-07 20:47:44 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2017-12-07 20:47:44 +0000
commit075a88fc7edbec8682bcd672de325ec1bedf129f (patch)
tree33d64f8ddc366a96e2c480b672224d44fc0e6355 /src/sp-guide.cpp
parentUpdate to trunk (diff)
parentFix bug 1733422 - Bezier and pencil tool don't work form: from clipboard (diff)
downloadinkscape-075a88fc7edbec8682bcd672de325ec1bedf129f.tar.gz
inkscape-075a88fc7edbec8682bcd672de325ec1bedf129f.zip
Mege trunk into powerpencilII
Diffstat (limited to 'src/sp-guide.cpp')
-rw-r--r--src/sp-guide.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index 8b4bf121d..fe6d0b64a 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -112,9 +112,8 @@ void SPGuide::set(unsigned int key, const gchar *value) {
this->set_label(this->label, false);
break;
case SP_ATTR_INKSCAPE_LOCKED:
- this->locked = helperfns_read_bool(value, false);
if (value) {
- this->set_locked(this->locked, false);
+ this->set_locked(helperfns_read_bool(value, false), false);
}
break;
case SP_ATTR_ORIENTATION:
@@ -275,7 +274,8 @@ void SPGuide::showSPGuide(SPCanvasGroup *group, GCallback handler)
{
SPCanvasItem *item = sp_guideline_new(group, label, point_on_line, normal_to_line);
sp_guideline_set_color(SP_GUIDELINE(item), color);
-
+ sp_guideline_set_locked(SP_GUIDELINE(item), locked);
+
g_signal_connect(G_OBJECT(item), "event", G_CALLBACK(handler), this);
views.push_back(SP_GUIDELINE(item));