diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2016-01-07 15:44:24 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2016-01-21 11:25:56 +1000 |
| commit | 743e324c6a25a545f7a03bc0c6d16a421116f7f0 (patch) | |
| tree | f71b6ce0bc6b4741b9f37edd2c8750c0a608756d /gtk2_ardour/editor_canvas_events.cc | |
| parent | c6805c1454f9dea518d7ba0f0eb4ecee1a1c6906 (diff) | |
Remove goto in Editor::track_canvas_scroll
Diffstat (limited to 'gtk2_ardour/editor_canvas_events.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index c889de072d..c439bdaaa3 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -72,7 +72,6 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) Duple event_coords = _track_canvas->window_to_canvas (Duple (ev->x, ev->y)); - retry: switch (direction) { case GDK_SCROLL_UP: if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) { @@ -83,8 +82,8 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) zoom_focus = temp_focus; return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) { - direction = GDK_SCROLL_LEFT; - goto retry; + scroll_left_step (); + return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomVerticalModifier)) { if (!current_stepping_trackview) { step_timeout = Glib::signal_timeout().connect (sigc::mem_fun(*this, &Editor::track_height_step_timeout), 500); @@ -112,8 +111,8 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) zoom_focus = temp_focus; return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) { - direction = GDK_SCROLL_RIGHT; - goto retry; + scroll_right_step (); + return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomVerticalModifier)) { if (!current_stepping_trackview) { step_timeout = Glib::signal_timeout().connect (sigc::mem_fun(*this, &Editor::track_height_step_timeout), 500); |