From 91909f748d1a07bf52b1289c8cb05f60388c6040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sat, 3 Sep 2022 23:53:58 +0200 Subject: [PATCH 1/5] Reenable flickable behavior in the GridView Touchpads aren't properly mapped to the wheelhandler in qt 5.15, there is a fix in Qt6 --- YACReaderLibrary/qml/GridComicsView.qml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/YACReaderLibrary/qml/GridComicsView.qml b/YACReaderLibrary/qml/GridComicsView.qml index 50b7db6bf..d5366df51 100644 --- a/YACReaderLibrary/qml/GridComicsView.qml +++ b/YACReaderLibrary/qml/GridComicsView.qml @@ -707,8 +707,7 @@ Rectangle { currentIndex: 0 cacheBuffer: 0 - //disable flickable behaviour - interactive: false + interactive: true move: Transition { NumberAnimation { properties: "x,y"; duration: 250 } From e92a537f9546bbe6f8a32e6e2f33454b94eb26f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sun, 4 Sep 2022 10:05:11 +0200 Subject: [PATCH 2/5] Fix flow scrolling in macos --- common/scroll_management.cpp | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/common/scroll_management.cpp b/common/scroll_management.cpp index a9573037a..6bdef5cd6 100644 --- a/common/scroll_management.cpp +++ b/common/scroll_management.cpp @@ -1,4 +1,6 @@ #include "scroll_management.h" +#include +#include ScrollManagement::ScrollManagement() { @@ -9,12 +11,24 @@ ScrollManagement::ScrollManagement() ScrollManagement::Movement ScrollManagement::getMovement(QWheelEvent *event) { - /*QLOG_DEBUG() << "WheelEvent angle delta : " << event->angleDelta(); - QLOG_DEBUG() << "WheelEvent pixel delta : " << event->pixelDelta();*/ + // qDebug() << "WheelEvent angle delta : " << event->angleDelta(); + // qDebug() << "WheelEvent pixel delta : " << event->pixelDelta(); + // qDebug() << "Accumulator : " << wheelAccumulator; + int delta; int tooFast = 1; 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 if ((wheelTimer->elapsed() < tooFast)) { @@ -22,12 +36,6 @@ ScrollManagement::Movement ScrollManagement::getMovement(QWheelEvent *event) 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 if ((wheelTimer->elapsed() < timeThrottle)) { event->setAccepted(true); From 906028b1841699bbb995cf7c12a855702fb93b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sun, 4 Sep 2022 17:47:09 +0200 Subject: [PATCH 3/5] Always clear the page number field in GoToDialog when it is opened --- YACReader/goto_dialog.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/YACReader/goto_dialog.cpp b/YACReader/goto_dialog.cpp index ea783fb79..537ab9104 100644 --- a/YACReader/goto_dialog.cpp +++ b/YACReader/goto_dialog.cpp @@ -74,6 +74,7 @@ void GoToDialog::setNumPages(unsigned int numPages) void GoToDialog::open() { + pageNumber->clear(); pageNumber->setFocus(); QDialog::open(); } From 63330dd82f240557a44ffbd6052de6fe44a29bee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sun, 4 Sep 2022 22:43:00 +0200 Subject: [PATCH 4/5] Update CHANGELOG --- CHANGELOG.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dff24d7db..3b6c9a63d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,18 @@ 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 * Show error when opening bad open recent entries From 68b3d75c921685167498e1cfd4b3a1aac836a648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sun, 4 Sep 2022 22:43:57 +0200 Subject: [PATCH 5/5] BUMP version number --- common/yacreader_global.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/yacreader_global.h b/common/yacreader_global.h index dbaac0737..306014d77 100644 --- a/common/yacreader_global.h +++ b/common/yacreader_global.h @@ -5,7 +5,7 @@ #include #include -#define VERSION "9.9.0" +#define VERSION "9.9.1" #define REMOTE_BROWSE_PERFORMANCE_WORKAROUND "REMOTE_BROWSE_PERFORMANCE_WORKAROUND"