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

Change how wheel scrolling works in qml grid views

Browse Source 
This fixes scrolling in Qt6
This commit is contained in:
Luis Ángel San Martín 2023-01-14 14:15:30 +01:00
parent dec297a63c
commit 8f0619887c
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
YACReaderLibrary/qml/FolderContentView.qml
View File

@ -428,7 +428,7 @@ Rectangle {
return; 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; grid.contentY = newValue;
} }
} }

10
YACReaderLibrary/qml/FolderContentView6.qml
View File

@ -430,11 +430,19 @@ Rectangle {
return; 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; grid.contentY = newValue;
} }
} }
onOriginYChanged: {
console.log(" origin changed ", grid.originY)
}
onContentYChanged: {
console.log(" content y changed ", grid.contentY)
}
ScrollBar.vertical: ScrollBar { ScrollBar.vertical: ScrollBar {
visible: grid.contentHeight > grid.height visible: grid.contentHeight > grid.height

2
YACReaderLibrary/qml/GridComicsView.qml
View File

@ -715,7 +715,7 @@ SplitView {
return; 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; grid.contentY = newValue;
} }
} }

2
YACReaderLibrary/qml/GridComicsView6.qml
View File

@ -722,7 +722,7 @@ SplitView {
return; 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; grid.contentY = newValue;
} }
} }