Fix UI parts focus keybind and buttons

2020-05-14 02:14:54 -04:00
parent d444c800b9
commit 45048e625c
5 changed files with 16 additions and 16 deletions
--- a/src/gui/MainPane/BottomBar.qml
+++ b/src/gui/MainPane/BottomBar.qml
@@ -16,17 +16,6 @@ Rectangle {
    readonly property alias filterField: filterField


-    function toggleFocus() {
-        if (filterField.activeFocus) {
-            pageLoader.takeFocus()
-            return
-        }
-
-        mainPane.open()
-        filterField.forceActiveFocus()
-    }
-
-
    HRowLayout {
        anchors.fill: parent

@@ -67,7 +56,7 @@ Rectangle {
            }

            Keys.onEscapePressed: {
-                mainUI.pageLoader.forceActiveFocus()
+                mainPane.toggleFocus()
                if (window.settings.clearRoomFilterOnEscape) text = ""
            }

@@ -81,7 +70,7 @@ Rectangle {

            HShortcut {
                sequences: window.settings.keys.toggleFocusMainPane
-                onActivated: toggleFocus()
+                onActivated: mainPane.toggleFocus()
            }
        }
    }