ardour/livetrax
13
0
Fork 0
Code

Allow to override zoom-focus to mouse

Browse Source 
When Prefs > Editor > Zoom to mouse position... is disabled.
Ctrl + Scroll now allows to override the current zoom-focus,
and zoom in/out at the mouse-cursor position.
This commit is contained in:
Robin Gareus 2020-04-17 16:15:50 +02:00
parent ca9e54100a
commit 7ae4e0f7ba
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/editor_canvas_events.cc
View File

@ -1056,11 +1056,12 @@ 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 (Keyboard::modifier_state_equals (event->scroll.state, Keyboard::ScrollHorizontalModifier)) {
Keyboard::ScrollHorizontalModifier)) {
scroll_left_step (); scroll_left_step ();
} else if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) { } else if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) {
temporal_zoom_step_mouse_focus (false); temporal_zoom_step_mouse_focus (false);
} else if (Keyboard::modifier_state_equals (event->scroll.state, Keyboard::PrimaryModifier)) {
temporal_zoom_step_mouse_focus (false);
} else { } else {
temporal_zoom_step (false); temporal_zoom_step (false);
} }
@ -1068,11 +1069,12 @@ Editor::canvas_ruler_event (GdkEvent *event, ArdourCanvas::Item* item, ItemType
break; break;
case GDK_SCROLL_DOWN: case GDK_SCROLL_DOWN:
if (Keyboard::modifier_state_equals(event->scroll.state, if (Keyboard::modifier_state_equals (event->scroll.state, Keyboard::ScrollHorizontalModifier)) {
Keyboard::ScrollHorizontalModifier)) {
scroll_right_step (); scroll_right_step ();
} else if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) { } else if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) {
temporal_zoom_step_mouse_focus (true); temporal_zoom_step_mouse_focus (true);
} else if (Keyboard::modifier_state_equals (event->scroll.state, Keyboard::PrimaryModifier)) {
temporal_zoom_step_mouse_focus (true);
} else { } else {
temporal_zoom_step (true); temporal_zoom_step (true);
} }