This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit 951bc1b4b0b06ff06253afedbde05fca8fdf2cbf Author: David Capello <[email protected]> Date: Fri Apr 8 18:20:18 2016 -0300 Avoid scrolling and zooming at the same time on Skia/OSX back-end --- src/app/ui/editor/state_with_wheel_behavior.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/ui/editor/state_with_wheel_behavior.cpp b/src/app/ui/editor/state_with_wheel_behavior.cpp index 42b8c3e..d30aae4 100644 --- a/src/app/ui/editor/state_with_wheel_behavior.cpp +++ b/src/app/ui/editor/state_with_wheel_behavior.cpp @@ -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; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
