Skip to content
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.

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

Introduce scroll delta for CTRL+touchpad-zoom #184

Open
wants to merge 1 commit into
base: Version16x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion scribus/scribusview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3158,7 +3158,12 @@ void ScribusView::wheelEvent(QWheelEvent *w)
if (w->modifiers() == Qt::ControlModifier)
{
FPoint mp = m_canvas->globalToCanvas(w->globalPos());
w->delta() > 0 ? slotZoomIn(mp.x(), mp.y() , true) : slotZoomOut(mp.x(), mp.y(), true);
wheelAccumulatedDelta += w->delta();
if (abs(wheelAccumulatedDelta) >= QWheelEvent::DefaultDeltasPerStep)
{
wheelAccumulatedDelta > 0 ? slotZoomIn(mp.x(), mp.y() , true) : slotZoomOut(mp.x(), mp.y(), true);
wheelAccumulatedDelta = 0;
}
}
else
{
Expand Down
1 change: 1 addition & 0 deletions scribus/scribusview.h
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ public slots: // Public slots
bool linkAfterDraw { false };
bool ImageAfterDraw { false };
QStack<ViewState> m_viewStates;
int wheelAccumulatedDelta { 0 };

private slots:
void setZoom();
Expand Down