Merge pull request #5145 from nextcloud/feature/userstatusselector-modal

Make user status selector modal, show user header

src/gui/UserStatusSelectorPage.qml

@@ -39,7 +39,6 @@ Page {
     contentItem: UserStatusSelector {
         id: userStatusSelector
         userStatusSelectorModel: model
-        onImplicitHeightChanged: implicitHeight > page.availableHeight ?
-            spacing = Style.standardSpacing : spacing = Style.standardSpacing * 2
+        spacing: Style.standardSpacing
     }
 }

src/gui/tray/Window.qml

@@ -106,10 +106,10 @@ ApplicationWindow {
     Drawer {
         id: userStatusDrawer
         width: parent.width
-        height: parent.height
+        height: parent.height - Style.trayDrawerMargin
         padding: 0
         edge: Qt.BottomEdge
-        modal: false
+        modal: true
         visible: false
 
         background: Rectangle {

theme/Style/Style.qml

@@ -42,6 +42,7 @@ QtObject {
     property int trayModalWidth: 380
     property int trayModalHeight: 490
     property int trayListItemIconSize: accountAvatarSize
+    property int trayDrawerMargin: trayWindowHeaderHeight
     property real thumbnailImageSizeReduction: 0.2  // We reserve some space within the thumbnail "item", here about 20%.
                                                     // This is because we need to also add the added/modified icon and we
                                                     // want them to fit within the general icon size. We also need to know