mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-12-26 18:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Editor::onMouseWheel() to use precise wheel as a touch device (scroll by default)

Browse Source 
On OS X, when we receive a precise wheel event, it means that the user
has pressed a touch-like device (trackpad, magic mouse, wacom tablet),
so he can scroll by default with the device (it's not a real mouse wheel).
The zoom can be done with the pinch gesture.
This commit is contained in:
David Capello 2016-04-11 12:59:51 -03:00
parent 951bc1b4b0
commit 2a007bffb9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,12 +47,14 @@ bool StateWithWheelBehavior::onMouseWheel(Editor* editor, MouseMessage* msg)
else else
wheelAction = WHEEL_FG; wheelAction = WHEEL_FG;
} }
// Normal behavior: mouse wheel zooms // Normal behavior: mouse wheel zooms If the message is from a
else if (Preferences::instance().editor.zoomWithWheel()) { // precise wheel i.e. a trackpad/touch-like device, we scroll by
// default.
else if (Preferences::instance().editor.zoomWithWheel() &&
!msg->preciseWheel()) {
if (msg->ctrlPressed()) if (msg->ctrlPressed())
wheelAction = WHEEL_FRAME; wheelAction = WHEEL_FRAME;
else if ((msg->wheelDelta().x != 0 && !msg->preciseWheel()) || else if (msg->wheelDelta().x != 0 || msg->shiftPressed())
(msg->shiftPressed()))
wheelAction = WHEEL_HSCROLL; wheelAction = WHEEL_HSCROLL;
else else
wheelAction = WHEEL_ZOOM; wheelAction = WHEEL_ZOOM;