mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-22 13:05:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4329 from nextcloud/buigfix/linecount-tray-activity

Browse source 
Increase maximum text line count in tray activity items to two lines
This commit is contained in:
Matthieu Gallien 2022-03-15 12:31:36 +01:00 committed by GitHub
commit f4669285f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gui/tray/ActivityItemContent.qml
View file

@ -48,6 +48,8 @@ RowLayout {
text: (root.activityData.type === "Activity" || root.activityData.type === "Notification") ? root.activityData.subject : root.activityData.message text: (root.activityData.type === "Activity" || root.activityData.type === "Notification") ? root.activityData.subject : root.activityData.message
width: parent.width width: parent.width
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.Wrap
maximumLineCount: 2
font.pixelSize: Style.topLinePixelSize font.pixelSize: Style.topLinePixelSize
color: root.activityData.activityTextTitleColor color: root.activityData.activityTextTitleColor
} }
@ -58,18 +60,22 @@ RowLayout {
: (root.activityData.type === "File") ? root.activityData.subject : (root.activityData.type === "File") ? root.activityData.subject
: (root.activityData.type === "Notification") ? root.activityData.message : (root.activityData.type === "Notification") ? root.activityData.message
: "" : ""
height: (text === "") ? 0 : activityTextTitle.height height: (text === "") ? 0 : implicitHeight
width: parent.width width: parent.width
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.Wrap
maximumLineCount: 2
font.pixelSize: Style.subLinePixelSize font.pixelSize: Style.subLinePixelSize
} }
Label { Label {
id: activityTextDateTime id: activityTextDateTime
text: root.activityData.dateTime text: root.activityData.dateTime
height: (text === "") ? 0 : activityTextTitle.height height: (text === "") ? 0 : implicitHeight
width: parent.width width: parent.width
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.Wrap
maximumLineCount: 2
font.pixelSize: Style.subLinePixelSize font.pixelSize: Style.subLinePixelSize
color: "#808080" color: "#808080"
} }