Skip to content

Fix zoom behavior for high-resolution touchpads #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AmonRaNet merged 2 commits into from
May 5, 2025
Merged

Fix zoom behavior for high-resolution touchpads #61

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec86945
Fix zoom behavior for high-resolution touchpads
Feb 26, 2025
4ee946f
Merge branch 'master' into fix/wheelZoom
AmonRaNet May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions lib/src/QGVMapQGView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,11 @@ void QGVMapQGView::zoomByWheel(QWheelEvent* event)
event->accept();

#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
const QPoint eventPos(event->position().x(), event->position().y());
const auto eventDelta = event->angleDelta().y();
const QPoint eventPos(qRound(event->position().x()), qRound(event->position().y()));
int eventDelta = event->angleDelta().y();
if (eventDelta == 0) {
eventDelta = event->pixelDelta().y();
}
#else
const QPoint eventPos(event->pos().x(), event->pos().y());
const auto eventDelta = event->delta();
Expand All @@ -266,9 +269,9 @@ void QGVMapQGView::zoomByWheel(QWheelEvent* event)
double newScale = mScale;

if (eventDelta > 0) {
newScale *= wheelExponentDown;
} else {
newScale /= wheelExponentUp;
newScale *= qPow(wheelExponentDown, eventDelta / 120.0);
} else if (eventDelta < 0) {
newScale /= qPow(wheelExponentUp, -eventDelta / 120.0);
}
cameraScale(newScale);

Expand Down
Loading