From 7eb3cb0bed268d976197ea895b2cffc7ddfde6b5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 1 Dec 2009 18:38:24 +0000 Subject: [PATCH] Fix scrollwheel operation in editor. git-svn-id: svn://localhost/ardour2/branches/3.0@6256 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor.h | 1 - gtk2_ardour/editor_ops.cc | 14 ++++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index bccc4b640d..73a4649e94 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -872,7 +872,6 @@ class Editor : public PublicEditor Gtk::HBox bottom_hbox; Gtk::Table edit_packer; - Gtk::VScrollbar edit_vscrollbar; Gtk::Adjustment vertical_adjustment; Gtk::Adjustment horizontal_adjustment; diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index eaef67934c..0cb50d246a 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -1495,21 +1495,19 @@ Editor::scroll_tracks_up () void Editor::scroll_tracks_down_line () { + double vert_value = vertical_adjustment.get_value() + 60; - Gtk::Adjustment* adj = edit_vscrollbar.get_adjustment(); - double vert_value = adj->get_value() + 60; - - if (vert_value>adj->get_upper() - _canvas_height) { - vert_value = adj->get_upper() - _canvas_height; + if (vert_value > vertical_adjustment.get_upper() - _canvas_height) { + vert_value = vertical_adjustment.get_upper() - _canvas_height; } - adj->set_value (vert_value); + + vertical_adjustment.set_value (vert_value); } void Editor::scroll_tracks_up_line () { - Gtk::Adjustment* adj = edit_vscrollbar.get_adjustment(); - adj->set_value (adj->get_value() - 60); + reset_y_origin (vertical_adjustment.get_value() - 60); } /* ZOOM */