Make user status selector modal, show user header

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/UserStatusSelectorPage.qml b/src/gui/UserStatusSelectorPage.qml
index c89d821d91f0d6f7901bb6ef8df50c171dbc2748..8c9aeea7a325076c6ccc4bb2c9a1d91a8bb9a3b3 100644 (file)
--- a/src/gui/UserStatusSelectorPage.qml
+++ b/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
     }
 }

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index c462b305f9910569bddc5cf0f529b811a0b0c031..75e67f643b523a9f988f56e9fc4838b8a5108d18 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -106,10 +106,10 @@ ApplicationWindow {
     Drawer {\r
         id: userStatusDrawer\r
         width: parent.width\r
-        height: parent.height\r
+        height: parent.height - Style.trayDrawerMargin\r
         padding: 0\r
         edge: Qt.BottomEdge\r
-        modal: false\r
+        modal: true\r
         visible: false\r
 \r
         background: Rectangle {\r

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index cba2ee9f3911b0a25ddf08d881fff5732f27f941..06008acb3679daa661bf8cb52fce7472baacdc9d 100644 (file)
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -42,6 +42,7 @@ QtObject {
     property int trayModalWidth: 380\r
     property int trayModalHeight: 490\r
     property int trayListItemIconSize: accountAvatarSize\r
+    property int trayDrawerMargin: trayWindowHeaderHeight\r
     property real thumbnailImageSizeReduction: 0.2  // We reserve some space within the thumbnail "item", here about 20%.\r
                                                     // This is because we need to also add the added/modified icon and we\r
                                                     // want them to fit within the general icon size. We also need to know\r