diff options
Diffstat (limited to 'src/sp-namedview.cpp')
| -rw-r--r-- | src/sp-namedview.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index 2992b85d3..ef22eca2d 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -593,10 +593,9 @@ void SPNamedView::set(unsigned int key, const gchar* value) { break; } case SP_ATTR_INKSCAPE_LOCKGUIDES: - this->lockguides = value ? sp_str_to_bool(value) : FALSE; - sp_namedview_lock_guides(this); - this->requestModified(SP_OBJECT_MODIFIED_FLAG); - break; + this->lockguides = value ? sp_str_to_bool(value) : FALSE; + this->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; default: SPObjectGroup::set(key, value); break; @@ -671,7 +670,6 @@ void SPNamedView::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *r } sp_namedview_show_single_guide(SP_GUIDE(g), this->showguides); - sp_namedview_lock_single_guide(SP_GUIDE(g), this->lockguides); } } } @@ -721,7 +719,6 @@ void SPNamedView::show(SPDesktop *desktop) (*it)->sensitize(desktop->getCanvas(), TRUE); } sp_namedview_show_single_guide((*it), showguides); - sp_namedview_lock_single_guide((*it), lockguides); } views.push_back(desktop); @@ -1013,9 +1010,10 @@ void sp_namedview_toggle_guides(SPDocument *doc, Inkscape::XML::Node *repr) doc->setModifiedSinceSave(); } -void sp_namedview_guides_toggle_lock(SPDocument *doc, Inkscape::XML::Node *repr) +void sp_namedview_guides_toggle_lock(SPDocument *doc, SPNamedView * namedview) { unsigned int v; + Inkscape::XML::Node *repr = namedview->getRepr(); unsigned int set = sp_repr_get_boolean(repr, "inkscape:lockguides", &v); if (!set) { // hide guides if not specified, for backwards compatibility v = true; @@ -1026,6 +1024,7 @@ void sp_namedview_guides_toggle_lock(SPDocument *doc, Inkscape::XML::Node *repr) bool saved = DocumentUndo::getUndoSensitive(doc); DocumentUndo::setUndoSensitive(doc, false); sp_repr_set_boolean(repr, "inkscape:lockguides", v); + sp_namedview_lock_guides(namedview); DocumentUndo::setUndoSensitive(doc, saved); doc->setModifiedSinceSave(); } |