Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into HEAD

amnezia-vpn · Oct 3, 2023 · 21f6c7b · 21f6c7b
2 parents 2664a52 + 2447ab4
commit 21f6c7b
Show file tree

Hide file tree

Showing 4 changed files with 201 additions and 193 deletions.
diff --git a/client/resources.qrc b/client/resources.qrc
@@ -215,6 +215,5 @@
         <file>ui/qml/Controls2/ListViewWithLabelsType.qml</file>
         <file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
         <file>ui/qml/Controls2/TopCloseButtonType.qml</file>
-        <file>ui/qml/Components/HomeRootMenuButton.qml</file>
     </qresource>
 </RCC>
diff --git a/client/ui/qml/Components/HomeRootMenuButton.qml b/client/ui/qml/Components/HomeRootMenuButton.qml
diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
@@ -4,7 +4,6 @@ import QtQuick.Controls
 Drawer {
     id: drawer
     property bool needCloseButton: true
-    property bool isOpened: false
 
     Connections {
         target: PageController
@@ -53,16 +52,12 @@ Drawer {
     }
 
     onOpened: {
-        isOpened = true
-
         if (needCloseButton) {
             PageController.drawerOpen()
         }
     }
 
     onClosed: {
-        isOpened = false
-
         if (needCloseButton) {
             PageController.drawerClose()
         }
@@ -72,27 +67,4 @@ Drawer {
             PageController.updateNavigationBarColor(initialPageNavigationBarColor)
         }
     }
-
-
-    onPositionChanged: {
-        if (isOpened && (position <= 0.99 && position >= 0.95)) {
-            mouseArea.canceled()
-            drawer.close()
-            mouseArea.exited()
-            dropArea.exited()
-        }
-    }
-
-    DropArea {
-        id: dropArea
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-
-        onPressed: {
-            isOpened = true
-        }
-    }
 }