From 8f0619887cd0b860f7b9020c0e526f94391c6c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sat, 14 Jan 2023 14:15:30 +0100 Subject: [PATCH] Change how wheel scrolling works in qml grid views This fixes scrolling in Qt6 --- YACReaderLibrary/qml/FolderContentView.qml | 2 +- YACReaderLibrary/qml/FolderContentView6.qml | 10 +++++++++- YACReaderLibrary/qml/GridComicsView.qml | 2 +- YACReaderLibrary/qml/GridComicsView6.qml | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/YACReaderLibrary/qml/FolderContentView.qml b/YACReaderLibrary/qml/FolderContentView.qml index 7517bfda..c9cf14e6 100644 --- a/YACReaderLibrary/qml/FolderContentView.qml +++ b/YACReaderLibrary/qml/FolderContentView.qml @@ -428,7 +428,7 @@ Rectangle { return; } - var newValue = Math.min((grid.contentHeight - grid.height - (true ? main.continuReadingHeight : main.topContentMargin)), (Math.max(grid.originY , grid.contentY - event.angleDelta.y))); + var newValue = Math.min((grid.contentHeight - grid.height + grid.originY), (Math.max(grid.originY , grid.contentY - event.angleDelta.y))); grid.contentY = newValue; } } diff --git a/YACReaderLibrary/qml/FolderContentView6.qml b/YACReaderLibrary/qml/FolderContentView6.qml index 0cf3ea16..49662ff0 100644 --- a/YACReaderLibrary/qml/FolderContentView6.qml +++ b/YACReaderLibrary/qml/FolderContentView6.qml @@ -430,11 +430,19 @@ Rectangle { return; } - var newValue = Math.min((grid.contentHeight - grid.height - (true ? main.continuReadingHeight : main.topContentMargin)), (Math.max(grid.originY , grid.contentY - event.angleDelta.y))); + var newValue = Math.min((grid.contentHeight - grid.height + grid.originY), (Math.max(grid.originY , grid.contentY - event.angleDelta.y))); grid.contentY = newValue; } } + onOriginYChanged: { + console.log(" origin changed ", grid.originY) + } + + onContentYChanged: { + console.log(" content y changed ", grid.contentY) + } + ScrollBar.vertical: ScrollBar { visible: grid.contentHeight > grid.height diff --git a/YACReaderLibrary/qml/GridComicsView.qml b/YACReaderLibrary/qml/GridComicsView.qml index 1786fca0..f8c37b2a 100644 --- a/YACReaderLibrary/qml/GridComicsView.qml +++ b/YACReaderLibrary/qml/GridComicsView.qml @@ -715,7 +715,7 @@ SplitView { return; } - var newValue = Math.min((grid.contentHeight - grid.height - (showCurrentComic ? 270 : 20)), (Math.max(grid.originY , grid.contentY - event.angleDelta.y))); + var newValue = Math.min((grid.contentHeight - grid.height + grid.originY), (Math.max(grid.originY , grid.contentY - event.angleDelta.y))); grid.contentY = newValue; } } diff --git a/YACReaderLibrary/qml/GridComicsView6.qml b/YACReaderLibrary/qml/GridComicsView6.qml index 10294fc0..3269c586 100644 --- a/YACReaderLibrary/qml/GridComicsView6.qml +++ b/YACReaderLibrary/qml/GridComicsView6.qml @@ -722,7 +722,7 @@ SplitView { return; } - var newValue = Math.min((grid.contentHeight - grid.height - (showCurrentComic ? 270 : 20)), (Math.max(grid.originY , grid.contentY - event.angleDelta.y))); + var newValue = Math.min((grid.contentHeight - grid.height + grid.originY), (Math.max(grid.originY , grid.contentY - event.angleDelta.y))); grid.contentY = newValue; } }