diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2007-08-03 19:59:25 +0000 |
|---|---|---|
| committer | dvlierop2 <dvlierop2@users.sourceforge.net> | 2007-08-03 19:59:25 +0000 |
| commit | 02a4d581812a5286809e74dc975441e5327707f1 (patch) | |
| tree | 10e4a588e05166457aebb0ee69f801368aa66e16 /src/sp-namedview.cpp | |
| parent | fix compile (diff) | |
| download | inkscape-02a4d581812a5286809e74dc975441e5327707f1.tar.gz inkscape-02a4d581812a5286809e74dc975441e5327707f1.zip | |
Rearrange snapping preferences, put distinction between paths and nodes back in, and a bit of refactoring
(bzr r3361)
Diffstat (limited to 'src/sp-namedview.cpp')
| -rw-r--r-- | src/sp-namedview.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index 7667d07f1..af30b3ed1 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -155,6 +155,8 @@ static void sp_namedview_build(SPObject *object, SPDocument *document, Inkscape: sp_object_read_attr(object, "inkscape:window-y"); sp_object_read_attr(object, "inkscape:snap-bbox"); sp_object_read_attr(object, "inkscape:snap-nodes"); + sp_object_read_attr(object, "inkscape:object-paths"); + sp_object_read_attr(object, "inkscape:object-nodes"); sp_object_read_attr(object, "inkscape:current-layer"); sp_object_read_attr(object, "inkscape:connector-spacing"); @@ -345,7 +347,15 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_INKSCAPE_SNAP_NODES: - nv->snap_manager.setSnapModeNodes(value ? sp_str_to_bool(value) : FALSE); + nv->snap_manager.setSnapModeNode(value ? sp_str_to_bool(value) : TRUE); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_OBJECT_PATHS: + nv->snap_manager.object.setSnapToItemPath(value ? sp_str_to_bool(value) : TRUE); + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_OBJECT_NODES: + nv->snap_manager.object.setSnapToItemNode(value ? sp_str_to_bool(value) : TRUE); object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_INKSCAPE_CURRENT_LAYER: @@ -432,6 +442,11 @@ sp_namedview_add_grid(SPNamedView *nv, Inkscape::XML::Node *repr, SPDesktop *des doc = sp_desktop_document(static_cast<SPDesktop*>(nv->views->data)); grid = Inkscape::CanvasGrid::NewGrid(nv, repr, doc, gridtype); nv->grids = g_slist_append(nv->grids, grid); + //Initialize the snapping parameters for the new grid + bool enabled_node = nv->snap_manager.getSnapModeNode(); + bool enabled_bbox = nv->snap_manager.getSnapModeBBox(); + grid->snapper->setSnapFrom(Inkscape::Snapper::SNAPPOINT_NODE, enabled_node); + grid->snapper->setSnapFrom(Inkscape::Snapper::SNAPPOINT_BBOX, enabled_bbox); } if (!desktop) { |