Migrate ruler position tracking to new track_widget API

Fixed bugs:
  - https://launchpad.net/bugs/1105504

(bzr r12067)

10 files changed, 4 insertions, 48 deletions

diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index 1cfe018ce..9942e3a13 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -196,7 +196,6 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
                 sp_guideline_set_position(SP_GUIDELINE(guide), event_dt);
 
                 desktop->set_coordinate_status(event_dt);
-                desktop->setPosition(event_dt);
             }
             break;
     case GDK_BUTTON_RELEASE:
@@ -395,7 +394,6 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
                 }
                 moved = true;
                 desktop->set_coordinate_status(motion_dt);
-                desktop->setPosition(motion_dt);
 
                 ret = TRUE;
             }
@@ -483,7 +481,6 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
                     }
                     moved = false;
                     desktop->set_coordinate_status(event_dt);
-                    desktop->setPosition (event_dt);
                 }
                 drag_type = SP_DRAG_NONE;
                 sp_canvas_item_ungrab(item, event->button.time);
diff --git a/src/desktop.cpp b/src/desktop.cpp
index ea23ebb9c..c7a763ae1 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -1539,12 +1539,6 @@ void SPDesktop::toggleSnapGlobal()
 // Callback implementations. The virtual ones are connected by the view.
 
 void
-SPDesktop::onPositionSet (double x, double y)
-{
-    _widget->viewSetPosition (Geom::Point(x,y));
-}
-
-void
 SPDesktop::onResized (double /*x*/, double /*y*/)
 {
    // Nothing called here
diff --git a/src/desktop.h b/src/desktop.h
index 529199692..93cf3201c 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -431,7 +431,6 @@ private:
     sigc::connection _commit_connection;
     sigc::connection _modified_connection;
 
-    virtual void onPositionSet (double, double);
     virtual void onResized (double, double);
     virtual void onRedrawRequested();
     virtual void onStatusMessage (Inkscape::MessageType type, gchar const *message);
diff --git a/src/event-context.cpp b/src/event-context.cpp
index 4e5917afa..096b310c3 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -1082,7 +1082,7 @@ gint sp_event_context_virtual_item_handler(SPEventContext * event_context, SPIte
 }
 
 /**
- * Emits 'position_set' signal on desktop and shows coordinates on status bar.
+ * Shows coordinates on status bar.
  */
 static void set_event_location(SPDesktop *desktop, GdkEvent *event) {
     if (event->type != GDK_MOTION_NOTIFY) {
@@ -1091,7 +1091,6 @@ static void set_event_location(SPDesktop *desktop, GdkEvent *event) {
 
     Geom::Point const button_w(event->button.x, event->button.y);
     Geom::Point const button_dt(desktop->w2d(button_w));
-    desktop->setPosition(button_dt);
     desktop->set_coordinate_status(button_dt);
 }
 
diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index 64bb95508..b6c6baaf7 100644
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -813,8 +813,6 @@ gboolean Inkscape::SelTrans::handleRequest(SPKnot *knot, Geom::Point *position,
         return TRUE;
     }
 
-    knot->desktop->setPosition(*position);
-
     // When holding shift while rotating or skewing, the transformation will be
     // relative to the point opposite of the handle; otherwise it will be relative
     // to the center as set for the selection
diff --git a/src/ui/view/edit-widget-interface.h b/src/ui/view/edit-widget-interface.h
index 412c7ff8c..26e47abbb 100644
--- a/src/ui/view/edit-widget-interface.h
+++ b/src/ui/view/edit-widget-interface.h
@@ -101,9 +101,6 @@ struct EditWidgetInterface
     /// Update the "inactive desktop" indicator
     virtual void deactivateDesktop() = 0;
 
-    /// Set rulers to position
-    virtual void viewSetPosition (Geom::Point p) = 0;
-
     /// Update rulers from current values
     virtual void updateRulers() = 0;
 
diff --git a/src/ui/view/view.cpp b/src/ui/view/view.cpp
index e13976cc4..72548e213 100644
--- a/src/ui/view/view.cpp
+++ b/src/ui/view/view.cpp
@@ -27,12 +27,6 @@ namespace UI {
 namespace View {
 
 static void 
-_onPositionSet (double x, double y, View* v)
-{
-    v->onPositionSet (x,y);
-}
-
-static void 
 _onResized (double x, double y, View* v)
 {
     v->onResized (x,y);
@@ -69,7 +63,6 @@ View::View()
     _message_stack = GC::release(new Inkscape::MessageStack());
     _tips_message_context = new Inkscape::MessageContext(_message_stack);
 
-    _position_set_connection = _position_set_signal.connect (sigc::bind (sigc::ptr_fun (&_onPositionSet), this));
     _resized_connection = _resized_signal.connect (sigc::bind (sigc::ptr_fun (&_onResized), this));
     _redraw_requested_connection = _redraw_requested_signal.connect (sigc::bind (sigc::ptr_fun (&_onRedrawRequested), this));
     
@@ -102,16 +95,6 @@ void View::_close() {
    Inkscape::Verb::delete_all_view (this);
 }
 
-void View::setPosition (double x, double y)
-{
-    _position_set_signal.emit (x,y);
-}
-
-void View::setPosition(Geom::Point const &p) 
-{ 
-    setPosition (double(p[Geom::X]), double(p[Geom::Y])); 
-}
-
 void View::emitResized (double width, double height)
 {
     _resized_signal.emit (width, height);
diff --git a/src/ui/view/view.h b/src/ui/view/view.h
index 6ed9f476c..48f4d2549 100644
--- a/src/ui/view/view.h
+++ b/src/ui/view/view.h
@@ -90,8 +90,6 @@ public:
     Inkscape::MessageContext *tipsMessageContext() const
       { return _tips_message_context; }
 
-    void setPosition(gdouble x, gdouble y);
-    void setPosition(Geom::Point const &p);
     void emitResized(gdouble width, gdouble height);
     void requestRedraw();
 
@@ -101,7 +99,6 @@ public:
     virtual void mouseover() = 0;
     virtual void mouseout() = 0;
 
-    virtual void onPositionSet (double, double) = 0;
     virtual void onResized (double, double) = 0;
     virtual void onRedrawRequested() = 0;
     virtual void onStatusMessage (Inkscape::MessageType type, gchar const *message) = 0;
@@ -126,13 +123,11 @@ protected:
      */
     virtual void setDocument(SPDocument *doc);
 
-    sigc::signal<void,double,double>   _position_set_signal;
     sigc::signal<void,double,double>   _resized_signal;
     sigc::signal<void,gchar const*>    _document_uri_set_signal;
     sigc::signal<void>                 _redraw_requested_signal;
 
 private:
-    sigc::connection _position_set_connection;
     sigc::connection _resized_connection;
     sigc::connection _redraw_requested_connection;
     sigc::connection _message_changed_connection;  // foreign
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index a7432c32a..8a47b345e 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -520,6 +520,9 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
     gtk_widget_set_can_focus (GTK_WIDGET (dtw->canvas), TRUE);
 
+    sp_ruler_add_track_widget (SP_RULER(dtw->hruler), GTK_WIDGET(dtw->canvas));
+    sp_ruler_add_track_widget (SP_RULER(dtw->vruler), GTK_WIDGET(dtw->canvas));
+
 #if GTK_CHECK_VERSION(3,0,0)
     GdkRGBA white = {1,1,1,1};
     gtk_widget_override_background_color(GTK_WIDGET(dtw->canvas),
@@ -1685,13 +1688,6 @@ SPDesktopWidget* SPDesktopWidget::createInstance(SPNamedView *namedview)
     return dtw;
 }
 
-void
-SPDesktopWidget::viewSetPosition (Geom::Point p)
-{
-    Geom::Point const origin = ( p - ruler_origin );
-    sp_ruler_set_position(SP_RULER(hruler), origin[Geom::X]);
-    sp_ruler_set_position(SP_RULER(vruler), origin[Geom::Y]);
-}
 
 void
 sp_desktop_widget_update_rulers (SPDesktopWidget *dtw)
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 73194304f..dedda7123 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -168,8 +168,6 @@ struct SPDesktopWidget {
             { sp_dtw_desktop_activate (_dtw); }
         virtual void deactivateDesktop()
             { sp_dtw_desktop_deactivate (_dtw); }
-        virtual void viewSetPosition (Geom::Point p)
-            { _dtw->viewSetPosition (p); }
         virtual void updateRulers()
             { sp_desktop_widget_update_rulers (_dtw); }
         virtual void updateScrollbars (double scale)