Fix canvas scroll-event zoom-focus
Unconditionally use the mouse-cursor as zoom-focus when holding <ctrl> while scrolling on the canvas. This is consistent with using ctrl + scroll in the ruler area.
This commit is contained in:
parent
0b67abca1d
commit
bc9b490e90
@ -83,11 +83,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
|
|||||||
switch (direction) {
|
switch (direction) {
|
||||||
case GDK_SCROLL_UP:
|
case GDK_SCROLL_UP:
|
||||||
if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) {
|
if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) {
|
||||||
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 {
|
|
||||||
temporal_zoom_step (false);
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) {
|
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) {
|
||||||
scroll_left_step ();
|
scroll_left_step ();
|
||||||
@ -112,11 +108,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
|
|||||||
|
|
||||||
case GDK_SCROLL_DOWN:
|
case GDK_SCROLL_DOWN:
|
||||||
if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) {
|
if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) {
|
||||||
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 {
|
|
||||||
temporal_zoom_step (true);
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) {
|
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) {
|
||||||
scroll_right_step ();
|
scroll_right_step ();
|
||||||
|
Loading…
Reference in New Issue
Block a user