AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Limit Drawer positioning by dragHeight and total page height

Browse source
This commit is contained in:
Matthew Schwiebert 2023-09-28 10:14:01 -04:00
parent 1a8c08799f
commit 058f8b544e
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/ui/qml/Controls2/DrawerType.qml
View file

@ -5,6 +5,7 @@ Drawer {
id: drawer id: drawer
property bool needCloseButton: true property bool needCloseButton: true
property bool isOpened: false property bool isOpened: false
property int pageHeight
Connections { Connections {
target: PageController target: PageController
@ -54,6 +55,7 @@ Drawer {
if (needCloseButton) { if (needCloseButton) {
PageController.drawerOpen() PageController.drawerOpen()
} }
position = (dragMargin / pageHeight)
} }
onAboutToHide: { onAboutToHide: {
@ -77,9 +79,10 @@ Drawer {
onPositionChanged: { onPositionChanged: {
if (isOpened && (position <= 0.99 && position >= 0.95)) { if (position < (dragMargin / root.height)) {
mouseArea.canceled() mouseArea.canceled()
drawer.close() drawer.close()
position = 0
mouseArea.exited() mouseArea.exited()
dropArea.exited() dropArea.exited()
} }

1
client/ui/qml/Pages2/PageHome.qml
View file

@ -148,6 +148,7 @@ PageType {
width: parent.width width: parent.width
height: parent.height * 0.9 height: parent.height * 0.9
pageHeight: root.height
ColumnLayout { ColumnLayout {
id: serversMenuHeader id: serversMenuHeader