mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-29 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid scrolling and zooming at the same time on Skia/OSX back-end

Browse Source
This commit is contained in:
David Capello 2016-04-08 18:20:18 -03:00
parent 1b28c8e482
commit 951bc1b4b0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/ui/editor/state_with_wheel_behavior.cpp
View File

@ -51,7 +51,8 @@ bool StateWithWheelBehavior::onMouseWheel(Editor* editor, MouseMessage* msg)
else if (Preferences::instance().editor.zoomWithWheel()) {
if (msg->ctrlPressed())
wheelAction = WHEEL_FRAME;
else if (msg->wheelDelta().x != 0 || msg->shiftPressed())
else if ((msg->wheelDelta().x != 0 && !msg->preciseWheel()) ||
(msg->shiftPressed()))
wheelAction = WHEEL_HSCROLL;
else
wheelAction = WHEEL_ZOOM;