mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #65 from vedgy/add-horizontal-wheel-support

Browse Source 
Reader: add support for horizontal mouse wheel
This commit is contained in:
Luis Ángel San Martín 2019-09-18 17:10:29 +02:00 committed by GitHub
commit 86c4b6158b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
YACReader/viewer.cpp
View File

@ -634,9 +634,30 @@ void Viewer::keyPressEvent(QKeyEvent *event)
QAbstractScrollArea::keyPressEvent(event);
}
static void animateScroll(QPropertyAnimation &scroller, const QScrollBar &scrollBar, int delta)
{
int deltaNotFinished = 0;
if (scroller.state() == QAbstractAnimation::Running) {
deltaNotFinished = scroller.startValue().toInt() - scroller.endValue().toInt();
scroller.stop();
}
const int currentPos = scrollBar.sliderPosition();
scroller.setDuration(250);
scroller.setStartValue(currentPos);
scroller.setEndValue(currentPos - delta - deltaNotFinished);
scroller.start();
}
void Viewer::wheelEvent(QWheelEvent *event)
{
if (render->hasLoadedComic()) {
if (event->orientation() == Qt::Horizontal) {
animateScroll(*horizontalScroller, *horizontalScrollBar(), event->delta());
return;
}
if ((event->delta() < 0) && (verticalScrollBar()->sliderPosition() == verticalScrollBar()->maximum())) {
if (wheelStop) {
if (getMovement(event) == Forward) {
@ -663,20 +684,7 @@ void Viewer::wheelEvent(QWheelEvent *event)
}
}
int deltaNotFinished = 0;
if (verticalScroller->state() == QAbstractAnimation::Running) {
deltaNotFinished = verticalScroller->startValue().toInt() - verticalScroller->endValue().toInt();
verticalScroller->stop();
}
int currentPos = verticalScrollBar()->sliderPosition();
verticalScroller->setDuration(250);
verticalScroller->setStartValue(currentPos);
verticalScroller->setEndValue(currentPos - event->delta() - deltaNotFinished);
verticalScroller->start();
//QAbstractScrollArea::wheelEvent(event);
animateScroll(*verticalScroller, *verticalScrollBar(), event->delta());
}
}