diff options
| author | Claudio Cambra <claudio.cambra@gmail.com> | 2022-04-14 01:27:43 +0300 |
|---|---|---|
| committer | Matthieu Gallien <matthieu.gallien@nextcloud.com> | 2022-04-20 19:07:41 +0300 |
| commit | 15078260b4b8e46421274be415b4474ae7ef5a02 (patch) | |
| tree | 6a47ccd5c3806f6e9936335a6cef87073319b928 /src/gui | |
| parent | 1e2c1585816491c10a6772932a6c495d2d627d93 (diff) | |
Removed spacing between activies, labels now centre-aligned
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/tray/ActivityItemContent.qml | 8 | ||||
| -rw-r--r-- | src/gui/tray/ActivityList.qml | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml index d716d76eb..640fa3876 100644 --- a/src/gui/tray/ActivityItemContent.qml +++ b/src/gui/tray/ActivityItemContent.qml @@ -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 { diff --git a/src/gui/tray/ActivityList.qml b/src/gui/tray/ActivityList.qml index fe66267f9..acfb1bbdc 100644 --- a/src/gui/tray/ActivityList.qml +++ b/src/gui/tray/ActivityList.qml @@ -31,7 +31,7 @@ ScrollView { clip: true - spacing: 10 + spacing: 0 delegate: ActivityItem { isFileActivityList: controlRoot.isFileActivityList |