mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-30 04:20:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Zoom timeline with Ctrl+mouse wheel

Browse Source
This commit is contained in:
David Capello 2017-11-10 18:24:06 -03:00
parent c13f6276ad
commit 0d6a432ef5
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/app/ui/timeline/timeline.cpp
View File

@ -1204,22 +1204,39 @@ bool Timeline::onProcessMessage(Message* msg)
case kMouseWheelMessage: case kMouseWheelMessage:
if (m_document) { if (m_document) {
gfx::Point delta = static_cast<MouseMessage*>(msg)->wheelDelta(); gfx::Point delta = static_cast<MouseMessage*>(msg)->wheelDelta();
if (!static_cast<MouseMessage*>(msg)->preciseWheel()) { const bool precise = static_cast<MouseMessage*>(msg)->preciseWheel();
delta.x *= frameBoxWidth();
delta.y *= layerBoxHeight();
if (delta.x == 0 && // On macOS shift already changes the wheel axis // Zoom timeline
msg->shiftPressed()) { if (msg->ctrlPressed() || // TODO configurable
if (std::fabs(delta.y) > delta.x) msg->cmdPressed()) {
std::swap(delta.x, delta.y); double dz = delta.x + delta.y;
if (precise) {
dz /= 1.5;
if (dz < -1.0) dz = -1.0;
else if (dz > 1.0) dz = 1.0;
} }
if (msg->altPressed()) { setZoomAndUpdate(m_zoom - dz);
delta.x *= 3; }
delta.y *= 3; else {
} if (!precise) {
delta.x *= frameBoxWidth();
delta.y *= layerBoxHeight();
if (delta.x == 0 && // On macOS shift already changes the wheel axis
msg->shiftPressed()) {
if (std::fabs(delta.y) > delta.x)
std::swap(delta.x, delta.y);
}
if (msg->altPressed()) {
delta.x *= 3;
delta.y *= 3;
}
}
setViewScroll(viewScroll() + delta);
} }
setViewScroll(viewScroll() + delta);
} }
break; break;