diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2006-04-10 02:14:05 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2006-04-10 02:14:05 +0000 |
| commit | 7e8a98224578e03e17fbf5e656241ff5ef1a0bc1 (patch) | |
| tree | 33ceaf82af27e800a3b81b2c367522f2252a9fb4 /gtk2_ardour/editor_ops.cc | |
| parent | e9f9ca5278c6bcafd6a22ad273185c31664c32a5 (diff) | |
Reinstate mouse scroll actions (audio clocks, shuttle wheel, faders), clearing selection is undoable, fix compiler warning, add modified patch by Jon Michael Smith for mouse wheel track height adjustment and vertical canvas scrolling (thanks Jon)
git-svn-id: svn://localhost/trunk/ardour2@449 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_ops.cc')
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index e5e16381ab..192269eb15 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -984,7 +984,12 @@ Editor::scroll_tracks_down () cnt = (int) floor (prefix); } - vertical_adjustment.set_value (vertical_adjustment.get_value() + (cnt * vertical_adjustment.get_page_size())); + double vert_value = vertical_adjustment.get_value() + (cnt * + vertical_adjustment.get_page_size()); + if (vert_value > vertical_adjustment.get_upper() - canvas_height) { + vert_value = vertical_adjustment.get_upper() - canvas_height; + } + vertical_adjustment.set_value (vert_value); } void @@ -1006,15 +1011,21 @@ Editor::scroll_tracks_up () void Editor::scroll_tracks_down_line () { + Gtk::Adjustment* adj = edit_vscrollbar.get_adjustment(); - adj->set_value (adj->get_value() + 10); + double vert_value = adj->get_value() + 20; + + if (vert_value>adj->get_upper() - canvas_height) { + vert_value = adj->get_upper() - canvas_height; + } + adj->set_value (vert_value); } void Editor::scroll_tracks_up_line () { Gtk::Adjustment* adj = edit_vscrollbar.get_adjustment(); - adj->set_value (adj->get_value() - 10); + adj->set_value (adj->get_value() - 20); } /* ZOOM */ |