From cb5c09d9679753785ecf3159e23a66bd877c9773 Mon Sep 17 00:00:00 2001 From: ronoaer Date: Sun, 15 Oct 2023 21:29:01 +0800 Subject: [PATCH] adapted questionDrawer --- client/ui/qml/Components/QuestionDrawer.qml | 3 ++- client/ui/qml/Components/ShareConnectionDrawer.qml | 2 +- client/ui/qml/Pages2/PageSettingsBackup.qml | 1 + client/ui/qml/Pages2/PageSettingsServerData.qml | 2 ++ client/ui/qml/Pages2/PageSettingsServerProtocol.qml | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/ui/qml/Components/QuestionDrawer.qml b/client/ui/qml/Components/QuestionDrawer.qml index edc8df9e..72067f97 100644 --- a/client/ui/qml/Components/QuestionDrawer.qml +++ b/client/ui/qml/Components/QuestionDrawer.qml @@ -15,10 +15,11 @@ Drawer2Type { property var yesButtonFunction property var noButtonFunction + property real drawerHeight: 0.5 width: parent.width height: parent.height - contentHeight: parent.height * 0.5 + contentHeight: parent.height * drawerHeight ColumnLayout { parent: root.contentParent diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml index 22c567a8..ae0df0e2 100644 --- a/client/ui/qml/Components/ShareConnectionDrawer.qml +++ b/client/ui/qml/Components/ShareConnectionDrawer.qml @@ -31,7 +31,7 @@ Drawer2Type { height: parent.height contentHeight: parent.height * 0.9 - onClose: { + onClosed: { configExtension = ".vpn" configCaption = qsTr("Save AmneziaVPN config") configFileName = "amnezia_config" diff --git a/client/ui/qml/Pages2/PageSettingsBackup.qml b/client/ui/qml/Pages2/PageSettingsBackup.qml index 1fb160a1..2caaf914 100644 --- a/client/ui/qml/Pages2/PageSettingsBackup.qml +++ b/client/ui/qml/Pages2/PageSettingsBackup.qml @@ -151,5 +151,6 @@ PageType { QuestionDrawer { id: questionDrawer + parent: root } } diff --git a/client/ui/qml/Pages2/PageSettingsServerData.qml b/client/ui/qml/Pages2/PageSettingsServerData.qml index b130eef9..2e401c67 100644 --- a/client/ui/qml/Pages2/PageSettingsServerData.qml +++ b/client/ui/qml/Pages2/PageSettingsServerData.qml @@ -193,6 +193,8 @@ PageType { QuestionDrawer { id: questionDrawer + drawerHeight: 0.8 + parent: root } } diff --git a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml index d1c8b22b..a518167c 100644 --- a/client/ui/qml/Pages2/PageSettingsServerProtocol.qml +++ b/client/ui/qml/Pages2/PageSettingsServerProtocol.qml @@ -141,6 +141,7 @@ PageType { QuestionDrawer { id: questionDrawer + parent: root } } }