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 #316 from YACReader/develop

Browse Source 
9.9.1 Release
This commit is contained in:
Luis Ángel San Martín 2022-09-04 22:45:03 +02:00 committed by GitHub
commit 982d58246c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGELOG.md
View File

@ -2,7 +2,18 @@
Version counting is based on semantic versioning (Major.Feature.Patch) Version counting is based on semantic versioning (Major.Feature.Patch)
## WIP ## 9.9.1
### YACReader
* Fix "go to" dialog not clearing the page number between runs.
* Fix scroll behavior in "go to flow" view (macos).
### YACReaderLibrary
* Fix scroll behavior in "cover flow" view (macos).
* Fix grid view unable to scroll in some systems.
## 9.9.0
### YACReader ### YACReader
* Show error when opening bad open recent entries * Show error when opening bad open recent entries

1
YACReader/goto_dialog.cpp
View File

@ -74,6 +74,7 @@ void GoToDialog::setNumPages(unsigned int numPages)
void GoToDialog::open() void GoToDialog::open()
{ {
pageNumber->clear();
pageNumber->setFocus(); pageNumber->setFocus();
QDialog::open(); QDialog::open();
} }

3
YACReaderLibrary/qml/GridComicsView.qml
View File

@ -707,8 +707,7 @@ Rectangle {
currentIndex: 0 currentIndex: 0
cacheBuffer: 0 cacheBuffer: 0
//disable flickable behaviour interactive: true
interactive: false
move: Transition { move: Transition {
NumberAnimation { properties: "x,y"; duration: 250 } NumberAnimation { properties: "x,y"; duration: 250 }

26
common/scroll_management.cpp
View File

@ -1,4 +1,6 @@
#include "scroll_management.h" #include "scroll_management.h"
#include <QtCore>
#include <QApplication>
ScrollManagement::ScrollManagement() ScrollManagement::ScrollManagement()
{ {
@ -9,12 +11,24 @@ ScrollManagement::ScrollManagement()
ScrollManagement::Movement ScrollManagement::getMovement(QWheelEvent *event) ScrollManagement::Movement ScrollManagement::getMovement(QWheelEvent *event)
{ {
/*QLOG_DEBUG() << "WheelEvent angle delta : " << event->angleDelta(); // qDebug() << "WheelEvent angle delta : " << event->angleDelta();
QLOG_DEBUG() << "WheelEvent pixel delta : " << event->pixelDelta();*/ // qDebug() << "WheelEvent pixel delta : " << event->pixelDelta();
// qDebug() << "Accumulator : " << wheelAccumulator;
int delta;
int tooFast = 1; int tooFast = 1;
int timeThrottle = 16; int timeThrottle = 16;
int minimumMove = 70; int minimumMove;
if (event->pixelDelta().x() != 0 || event->pixelDelta().y() != 0) {
delta = event->pixelDelta().y() + event->pixelDelta().x();
minimumMove = 30;
} else {
delta = (event->angleDelta().y() / 8) + (event->angleDelta().x() / 8);
minimumMove = 8;
}
wheelAccumulator += delta;
// avoid any events overflood // avoid any events overflood
if ((wheelTimer->elapsed() < tooFast)) { if ((wheelTimer->elapsed() < tooFast)) {
@ -22,12 +36,6 @@ ScrollManagement::Movement ScrollManagement::getMovement(QWheelEvent *event)
return None; return None;
} }
// Accumulate the delta
if ((event->angleDelta().y() < 0) != (wheelAccumulator < 0)) // different sign means change in direction
wheelAccumulator = 0;
wheelAccumulator += event->angleDelta().y();
// Do not process events too fast // Do not process events too fast
if ((wheelTimer->elapsed() < timeThrottle)) { if ((wheelTimer->elapsed() < timeThrottle)) {
event->setAccepted(true); event->setAccepted(true);

2
common/yacreader_global.h
View File

@ -5,7 +5,7 @@
#include <QDataStream> #include <QDataStream>
#include <QMetaType> #include <QMetaType>
#define VERSION "9.9.0" #define VERSION "9.9.1"
#define REMOTE_BROWSE_PERFORMANCE_WORKAROUND "REMOTE_BROWSE_PERFORMANCE_WORKAROUND" #define REMOTE_BROWSE_PERFORMANCE_WORKAROUND "REMOTE_BROWSE_PERFORMANCE_WORKAROUND"