diff options
| author | Claudio Cambra <claudio.cambra@gmail.com> | 2022-11-09 20:16:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-09 20:16:21 +0300 |
| commit | de7976eb83c087c60429f339bc74527dd85e680c (patch) | |
| tree | 31dfec85442cea854cbb5fb7075da3c1188c3bb8 | |
| parent | 136bbd14b3f739575ea2d38e14aa7dde8668a814 (diff) | |
| parent | 8315770467c31198785fa1b58e760303b2c568b8 (diff) | |
Merge pull request #5145 from nextcloud/feature/userstatusselector-modal
Make user status selector modal, show user header
| -rw-r--r-- | src/gui/UserStatusSelectorPage.qml | 3 | ||||
| -rw-r--r-- | src/gui/tray/Window.qml | 4 | ||||
| -rw-r--r-- | theme/Style/Style.qml | 1 |
3 files changed, 4 insertions, 4 deletions
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
|