From b91e472289a8dbc5f33884ea9a54b6d76de6f839 Mon Sep 17 00:00:00 2001 From: Rodolfo Ribeiro Gomes Date: Dec 13 2019 04:29:26 +0000 Subject: forgot to re-add scroll actions --- diff --git a/synfig-studio/src/gui/selectdraghelper.h b/synfig-studio/src/gui/selectdraghelper.h index 5d30660..90e7830 100644 --- a/synfig-studio/src/gui/selectdraghelper.h +++ b/synfig-studio/src/gui/selectdraghelper.h @@ -203,9 +203,8 @@ bool SelectDragHelper::process_event(GdkEvent *event) { switch(event->type) { - case GDK_SCROLL: { - break; - } + case GDK_SCROLL: + return process_scroll_event(&event->scroll); case GDK_MOTION_NOTIFY: return process_motion_event(&event->motion); case GDK_BUTTON_PRESS: diff --git a/synfig-studio/src/gui/widgets/widget_curves.cpp b/synfig-studio/src/gui/widgets/widget_curves.cpp index f331cdf..9a3f0f6 100644 --- a/synfig-studio/src/gui/widgets/widget_curves.cpp +++ b/synfig-studio/src/gui/widgets/widget_curves.cpp @@ -443,21 +443,13 @@ Widget_Curves::Widget_Curves(): channel_point_sd.signal_drag_finished().connect([&]() { // overlapped_waypoints.clear(); }); - channel_point_sd.signal_redraw_needed().connect([&]() { - queue_draw(); - }); - channel_point_sd.signal_focus_requested().connect([&]() { - grab_focus(); - }); - channel_point_sd.signal_selection_changed().connect([&]() { - queue_draw(); - }); - channel_point_sd.signal_zoom_in_requested().connect([&]() { - zoom_in(); - }); - channel_point_sd.signal_zoom_out_requested().connect([&]() { - zoom_out(); - }); + channel_point_sd.signal_redraw_needed().connect(sigc::mem_fun(*this, &Gtk::Widget::queue_draw)); + channel_point_sd.signal_focus_requested().connect(sigc::mem_fun(*this, &Gtk::Widget::grab_focus)); + channel_point_sd.signal_selection_changed().connect(sigc::mem_fun(*this, &Gtk::Widget::queue_draw)); + channel_point_sd.signal_zoom_in_requested().connect(sigc::mem_fun(*this, &Widget_Curves::zoom_in)); + channel_point_sd.signal_zoom_out_requested().connect(sigc::mem_fun(*this, &Widget_Curves::zoom_out)); + channel_point_sd.signal_scroll_up_requested().connect(sigc::mem_fun(*this, &Widget_Curves::scroll_up)); + channel_point_sd.signal_scroll_down_requested().connect(sigc::mem_fun(*this, &Widget_Curves::scroll_down)); } Widget_Curves::~Widget_Curves() {