From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Wed, 9 Nov 2022 13:07:51 +0000 (+0100)
Subject: Make user status selector modal, show user header
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~147^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8315770467c31198785fa1b58e760303b2c568b8;p=nextcloud-desktop.git

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 c89d821d9..8c9aeea7a 100644
--- 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 c462b305f..75e67f643 100644
--- a/src/gui/tray/Window.qml
+++ b/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 {
diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index cba2ee9f3..06008acb3 100644
--- a/theme/Style/Style.qml
+++ b/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