1) When pasting, use an offset that is a multiple of the grid pitch (got lost during a previous round of refactoring)

2) Refactor some of the pasting code

(bzr r6580)

1 files changed, 7 insertions, 6 deletions

diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h
index a9e317534..5d674bb2d 100644
--- a/src/display/canvas-grid.h
+++ b/src/display/canvas-grid.h
@@ -89,6 +89,13 @@ public:
 
     Gtk::Widget * newWidget();
 
+    NR::Point origin;     /**< Origin of the grid */
+    guint32 color;        /**< Color for normal lines */
+    guint32 empcolor;     /**< Color for emphasis lines */
+    gint empspacing;      /**< Spacing between emphasis lines */
+    
+    SPUnit const* gridunit;
+    
     Inkscape::XML::Node * repr;
     SPDocument *doc;
 
@@ -130,12 +137,6 @@ public:
     void readRepr();
     void onReprAttrChanged (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive);
 
-    NR::Point origin;
-    guint32 color;
-    guint32 empcolor;
-    gint  empspacing;
-    SPUnit const* gridunit;
-
     NR::Point spacing; /**< Spacing between elements of the grid */
     bool scaled[2];    /**< Whether the grid is in scaled mode, which can
                             be different in the X or Y direction, hense two