chore: post merge fixes

amnezia-vpn · Jan 2, 2025 · 694b789 · 694b789
1 parent cda9b5d
commit 694b789
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/client/ui/qml/Components/ChangelogDrawer.qml b/client/ui/qml/Components/ChangelogDrawer.qml
@@ -13,7 +13,7 @@ DrawerType2 {
     anchors.fill: parent
     expandedHeight: parent.height * 0.9
 
-    expandedContent: Item {
+    expandedStateContent: Item {
         implicitHeight: root.expandedHeight
 
         Header2TextType {
@@ -73,7 +73,7 @@ DrawerType2 {
                 PageController.showBusyIndicator(true)
                 UpdateController.runInstaller()
                 PageController.showBusyIndicator(false)
-                root.close()
+                root.closeTriggered()
             }
         }
 
@@ -96,7 +96,7 @@ DrawerType2 {
             text: qsTr("Skip")
 
             clickedFunc: function() {
-                root.close()
+                root.closeTriggered()
             }
         }
     }

diff --git a/client/ui/qml/Controls2/PageType.qml b/client/ui/qml/Controls2/PageType.qml
@@ -20,7 +20,6 @@ Item {
         id: timer
         interval: 200 // Milliseconds
         onTriggered: {
-            console.debug(">>> PageType timer triggered")
             FocusController.resetRootObject()
             FocusController.setFocusOnDefaultItem()
         }

diff --git a/client/ui/qml/main2.qml b/client/ui/qml/main2.qml
@@ -98,7 +98,7 @@ Window  {
         }
 
         function onShowChangelogDrawer() {
-            changelogDrawer.open()
+            changelogDrawer.openTriggered()
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,7 +98,7 @@ Window { @@
             }
             function onShowChangelogDrawer() {
-                changelogDrawer.open()
+                changelogDrawer.openTriggered()
             }
         }
@@ Expand Down @@