Removed spacing between activies, labels now centre-aligned

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>

diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml
index d716d76ebf4be094a6234ba573fa3528833e28a6..640fa3876c7d9a4c67c3b67d4e4b967ac9d8f53b 100644 (file)
--- 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 fe66267f9934f38ab3f9532be675cce91a8668bc..acfb1bbdc74919d2a74ee71957c23e97e3f161d6 100644 (file)
--- 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