mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 21:14:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add options for disabling scroll animation

Browse Source
This commit is contained in:
Luis Ángel San Martín
2023-08-26 10:18:52 +02:00
parent d1533174b0
commit 5706407778
19 changed files with 369 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
YACReader/viewer.cpp
View File

@ -445,7 +445,7 @@ void Viewer::scrollDown()
next();
} else {
int currentPos = verticalScrollBar()->sliderPosition();
verticalScroller->setDuration(250);
verticalScroller->setDuration(animationDuration());
verticalScroller->setStartValue(currentPos);
verticalScroller->setEndValue(nextPos);
@ -461,7 +461,7 @@ void Viewer::scrollUp()
prev();
} else {
int currentPos = verticalScrollBar()->sliderPosition();
verticalScroller->setDuration(250);
verticalScroller->setDuration(animationDuration());
verticalScroller->setStartValue(currentPos);
verticalScroller->setEndValue(nextPos);
@ -604,16 +604,25 @@ void Viewer::scrollTo(int x, int y)
{
if (groupScroller->state() == QAbstractAnimation::Running)
return;
horizontalScroller->setDuration(250);
horizontalScroller->setDuration(animationDuration());
horizontalScroller->setStartValue(horizontalScrollBar()->sliderPosition());
horizontalScroller->setEndValue(x);
verticalScroller->setDuration(250);
verticalScroller->setDuration(animationDuration());
verticalScroller->setStartValue(verticalScrollBar()->sliderPosition());
verticalScroller->setEndValue(y);
groupScroller->start();
emit backgroundChanges();
}
int Viewer::animationDuration() const
{
if (Configuration::getConfiguration().getDisableScrollAnimation()) {
return 0;
} else {
return 250;
}
}
void Viewer::moveView(Qt::Key directionKey)
{
QKeyEvent event(QEvent::KeyPress, directionKey, Qt::NoModifier);
@ -621,7 +630,7 @@ void Viewer::moveView(Qt::Key directionKey)
emit backgroundChanges();
}
static void animateScroll(QPropertyAnimation &scroller, const QScrollBar &scrollBar, int delta)
void Viewer::animateScroll(QPropertyAnimation &scroller, const QScrollBar &scrollBar, int delta)
{
int deltaNotFinished = 0;
if (scroller.state() == QAbstractAnimation::Running) {
@ -630,7 +639,7 @@ static void animateScroll(QPropertyAnimation &scroller, const QScrollBar &scroll
}
const int currentPos = scrollBar.sliderPosition();
scroller.setDuration(250);
scroller.setDuration(animationDuration());
scroller.setStartValue(currentPos);
scroller.setEndValue(currentPos - delta - deltaNotFinished);
@ -639,9 +648,9 @@ static void animateScroll(QPropertyAnimation &scroller, const QScrollBar &scroll
void Viewer::wheelEvent(QWheelEvent *event)
{
auto delta = event->angleDelta();
if (render->hasLoadedComic()) {
auto delta = event->angleDelta();
if (delta.x() != 0) {
animateScroll(*horizontalScroller, *horizontalScrollBar(), delta.x());
return;