Add room header buttons to access sidepanes

src/gui/MainPane/MainPane.qml

@@ -14,7 +14,6 @@ HDrawer {
         if (! hasFocus) mainPaneList.detachedCurrentIndex = false
 
 
-
     property alias filter: bottomBar.roomFilter
 
     readonly property bool small:

src/gui/Pages/Chat/RoomHeader.qml

@@ -8,10 +8,35 @@ Rectangle {
     implicitHeight: theme.baseElementsHeight
     color: theme.chat.roomHeader.background
 
+
+    readonly property bool showPaneButtons: mainUI.mainPane.collapse
+
+    readonly property bool center:
+        showPaneButtons || window.settings.alwaysCenterRoomHeader
+
+
     HRowLayout {
         id: row
         anchors.fill: parent
 
+        HButton {
+            id: goToMainPaneButton
+            icon.name: "go-back-to-main-pane"
+            padded: false
+            visible: Layout.preferredWidth > 0
+
+            onClicked: mainUI.mainPane.toggleFocus()
+
+            Layout.preferredWidth: showPaneButtons ? avatar.width : 0
+            Layout.fillHeight: true
+
+            Behavior on Layout.preferredWidth { HNumberAnimation {} }
+        }
+
+        HSpacer {
+            visible: center
+        }
+
         HRoomAvatar {
             id: avatar
             roomId: chat.roomId
@@ -34,7 +59,12 @@ Rectangle {
             rightPadding: leftPadding
 
             Layout.preferredWidth: Math.min(
-                implicitWidth, row.width - row.spacing - avatar.width
+                implicitWidth,
+                row.width -
+                row.spacing * (showPaneButtons ? 3 : 1) -
+                goToMainPaneButton.width -
+                avatar.width -
+                goToRoomPaneButton.width
             )
             Layout.fillHeight: true
 
@@ -52,7 +82,16 @@ Rectangle {
             verticalAlignment: Text.AlignVCenter
             rightPadding: nameLabel.rightPadding
 
-            Layout.fillWidth: true
+            Layout.preferredWidth: Math.min(
+                implicitWidth,
+                row.width -
+                row.spacing * (showPaneButtons ? 3 : 1) -
+                goToMainPaneButton.width -
+                avatar.width -
+                nameLabel.width -
+                goToRoomPaneButton.width
+            )
+            Layout.fillWidth: ! center
             Layout.fillHeight: true
 
             HoverHandler { id: topicHover }
@@ -70,5 +109,21 @@ Rectangle {
             readonly property string topic:
                 topicLabel.truncated ?  chat.roomInfo.topic : ""
         }
+
+        HSpacer {
+            visible: center
+        }
+
+        HButton {
+            id: goToRoomPaneButton
+            padded: false
+            icon.name: "go-to-room-pane"
+            visible: goToMainPaneButton.visible
+
+            onClicked: chat.roomPane.toggleFocus()
+
+            Layout.preferredWidth: goToMainPaneButton.Layout.preferredWidth
+            Layout.fillHeight: true
+        }
     }
 }

src/gui/Pages/Chat/RoomPane/MemberView.qml

@@ -7,6 +7,9 @@ import "../../.."
 import "../../../Base"
 
 HColumnLayout {
+    readonly property alias keybindFocusItem: filterField
+
+
     HListView {
         id: memberList
         clip: true

src/gui/Pages/Chat/RoomPane/RoomPane.qml

@@ -34,6 +34,18 @@ MultiviewPane {
         onClicked: swipeView.currentIndex = Math.min(index, 1)
     }
 
+
+    function toggleFocus() {
+        if (swipeView.currentItem.keybindFocusItem.activeFocus) {
+            pageLoader.takeFocus()
+            return
+        }
+
+        roomPane.open()
+        swipeView.currentItem.keybindFocusItem.forceActiveFocus()
+    }
+
+
     MemberView {}
     SettingsView { fillAvailableHeight: true }
 }

src/gui/Pages/Chat/RoomPane/SettingsView.qml

@@ -53,6 +53,17 @@ HBox {
         encryptCheckBox.changed || requireInviteCheckbox.changed ||
         forbidGuestsCheckBox.changed
 
+    readonly property Item keybindFocusItem: {
+        for (let i = 0; i < visibleChildren.length; i++) {
+            const child = visibleChildren[i]
+
+            if (child.focus || (child.field && child.field.focus))
+                return visibleChildren[i]
+        }
+
+        return nameField.field
+    }
+
 
     HRoomAvatar {
         id: avatar
@@ -74,6 +85,8 @@ HBox {
         field.enabled: chat.roomInfo.can_set_name
 
         Layout.fillWidth: true
+
+        Component.onCompleted: field.forceActiveFocus()
     }
 
     HLabeledTextField {