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

Merge pull request #4438 from nextcloud/bugfix/activity-list-positioning

Browse source 
Fix positioning of activities in the activities list
This commit is contained in:
Claudio Cambra 2022-04-22 00:59:07 +02:00 committed by GitHub
commit 826960126e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -95,13 +95,14 @@ RowLayout {
Label {
id: activityTextTitle
text: (root.activityData.type === "Activity" || root.activityData.type === "Notification") ? root.activityData.subject : root.activityData.message
height: (text === "") ? 0 : implicitHeight
width: parent.width
elide: Text.ElideRight
wrapMode: Text.Wrap
maximumLineCount: 2
font.pixelSize: Style.topLinePixelSize
color: Style.ncTextColor
//color: root.activityData.activityTextTitleColor
visible: text !== ""
}
Label {
@ -117,6 +118,7 @@ RowLayout {
maximumLineCount: 2
font.pixelSize: Style.subLinePixelSize
color: Style.ncTextColor
visible: text !== ""
}
Label {
@ -129,18 +131,20 @@ RowLayout {
maximumLineCount: 2
font.pixelSize: Style.subLinePixelSize
color: Style.ncSecondaryTextColor
visible: text !== ""
}
Label {
id: talkReplyMessageSent
text: root.activityData.messageSent
height: implicitHeight
height: (text === "") ? 0 : implicitHeight
width: parent.width
elide: Text.ElideRight
wrapMode: Text.Wrap
maximumLineCount: 2
font.pixelSize: Style.topLinePixelSize
color: Style.ncSecondaryTextColor
visible: text !== ""
}
Loader {

2
src/gui/tray/ActivityList.qml
View file

@ -31,7 +31,7 @@ ScrollView {
clip: true
spacing: 10
spacing: 0
delegate: ActivityItem {
isFileActivityList: controlRoot.isFileActivityList