ardour/livetrax
13
0
Fork 0
Code

Fix/implement #6292, Shift + scroll wheel Scrolling in the ruler area

Browse Source 
Keep the same scrolling distance per event as when scroll left/right is used.

Scrolling in the ruler area is different than the track canvas area which I'm
not sure is a great idea as there is not much delineation between the two areas
but as the ruler area has some other different behaviour it is probably
acceptable/useful.
This commit is contained in:
Tim Mayberry 2016-01-07 16:33:51 +10:00
parent 2a13891970
commit 72bdfc38a8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk2_ardour/editor_canvas_events.cc
View File

@ -1028,8 +1028,10 @@ Editor::canvas_ruler_event (GdkEvent *event, ArdourCanvas::Item* item, ItemType
switch (event->scroll.direction) { switch (event->scroll.direction) {
case GDK_SCROLL_UP: case GDK_SCROLL_UP:
if (Keyboard::modifier_state_equals(event->scroll.state,
if (Profile->get_mixbus()) { Keyboard::ScrollHorizontalModifier)) {
scroll_left_half_page ();
} else if (Profile->get_mixbus()) {
//for mouse-wheel zoom, force zoom-focus to mouse //for mouse-wheel zoom, force zoom-focus to mouse
Editing::ZoomFocus temp_focus = zoom_focus; Editing::ZoomFocus temp_focus = zoom_focus;
zoom_focus = Editing::ZoomFocusMouse; zoom_focus = Editing::ZoomFocusMouse;
@ -1042,7 +1044,10 @@ Editor::canvas_ruler_event (GdkEvent *event, ArdourCanvas::Item* item, ItemType
break; break;
case GDK_SCROLL_DOWN: case GDK_SCROLL_DOWN:
if (Profile->get_mixbus()) { if (Keyboard::modifier_state_equals(event->scroll.state,
Keyboard::ScrollHorizontalModifier)) {
scroll_right_half_page ();
} else if (Profile->get_mixbus()) {
//for mouse-wheel zoom, force zoom-focus to mouse //for mouse-wheel zoom, force zoom-focus to mouse
Editing::ZoomFocus temp_focus = zoom_focus; Editing::ZoomFocus temp_focus = zoom_focus;
zoom_focus = Editing::ZoomFocusMouse; zoom_focus = Editing::ZoomFocusMouse;