diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2018-12-28 16:43:51 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2018-12-28 16:43:51 +0000 |
| commit | 79cdc70695bef38eaf862d47a95431088216ea1c (patch) | |
| tree | e17a08174e00077483ea0efedd94efe8b5d60c6c /src/widgets/desktop-widget.h | |
| parent | desktop-widget: Use members instead of static variables for ruler events (diff) | |
| download | inkscape-79cdc70695bef38eaf862d47a95431088216ea1c.tar.gz inkscape-79cdc70695bef38eaf862d47a95431088216ea1c.zip | |
SPDesktopWidget: Migrate ruler events to sigc++
Diffstat (limited to 'src/widgets/desktop-widget.h')
| -rw-r--r-- | src/widgets/desktop-widget.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h index fad4ffe2e..04fa0ac35 100644 --- a/src/widgets/desktop-widget.h +++ b/src/widgets/desktop-widget.h @@ -287,11 +287,10 @@ public: double get_hruler_thickness() const; double get_vruler_thickness() const; GtkAllocation get_canvas_allocation() const; - static int hruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw); - static int vruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw); void iconify(); void maximize(); void fullscreen(); + static gint ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw, bool horiz); private: GtkWidget *tool_toolbox; @@ -323,9 +322,11 @@ private: static void cms_adjust_toggled( GtkWidget *button, gpointer data ); static void color_profile_event(EgeColorProfTracker *tracker, SPDesktopWidget *dtw); #endif - static gint ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw, bool horiz); static void ruler_snap_new_guide(SPDesktop *desktop, SPCanvasItem *guide, Geom::Point &event_dt, Geom::Point &normal); static gint event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw); + bool on_ruler_box_button_press_event(GdkEventButton *event, Gtk::EventBox *widget, bool horiz); + bool on_ruler_box_button_release_event(GdkEventButton *event, Gtk::EventBox *widget, bool horiz); + bool on_ruler_box_motion_notify_event(GdkEventMotion *event, Gtk::EventBox *widget, bool horiz); }; /// The SPDesktopWidget vtable |