Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>2021-07-15 14:21:29 +0300
committerMatthieu Gallien (Rebase PR Action) <matthieu_gallien@yahoo.fr>2021-07-16 18:19:20 +0300
commit064f64f06d8a671e9aa2a145a81a97f633b8d9a5 (patch)
tree6355e1580d2d22452714da7f50aeaa6b3ea32445 /src/gui/tray
parent260e1d77f5263a1ce5abef42987bc2dfb27c22fd (diff)
fix width of user status message to not overlap other elements
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Diffstat (limited to 'src/gui/tray')
-rw-r--r--src/gui/tray/UserLine.qml13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index 899c64349..4143acaee 100644
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -17,8 +17,7 @@ MenuItem {
RowLayout {
id: userLineLayout
spacing: 0
- width: Style.currentAccountButtonWidth
- height: parent.height
+ anchors.fill: parent
Button {
id: accountButton
@@ -59,8 +58,7 @@ MenuItem {
RowLayout {
id: accountControlRowLayout
- height: accountButton.height
- width: accountButton.width
+ anchors.fill: parent
spacing: Style.userStatusSpacing
Image {
id: accountAvatar
@@ -100,19 +98,21 @@ MenuItem {
Column {
id: accountLabels
Layout.leftMargin: Style.accountLabelsSpacing
+ Layout.fillWidth: true
+ Layout.maximumWidth: parent.width - Style.accountLabelsSpacing
Label {
id: accountUser
- width: 128
text: name
elide: Text.ElideRight
color: "black"
font.pixelSize: Style.topLinePixelSize
font.bold: true
+ width: parent.width
}
Row {
visible: model.isConnected &&
model.serverHasUserStatus
- width: Style.currentAccountLabelWidth + Style.userStatusEmojiSize
+ width: parent.width
Label {
id: emoji
height: Style.topLinePixelSize
@@ -123,6 +123,7 @@ MenuItem {
Label {
id: message
height: Style.topLinePixelSize
+ width: parent.width - parent.spacing - emoji.width
visible: model.statusMessage !== ""
text: statusMessage
elide: Text.ElideRight