Properly resize Audio & File widgets

Remove empty space between username & timeline widgets

1 files changed, 9 insertions, 3 deletions

diff --git a/src/timeline/TimelineItem.cc b/src/timeline/TimelineItem.cc

index 166199cd..47bc20ea 100644
--- a/src/timeline/TimelineItem.cc
+++ b/src/timeline/TimelineItem.cc
@@ -423,6 +423,9 @@ TimelineItem::markReceived()
 void
 TimelineItem::generateBody(const QString &body)
 {
+        if (body.isEmpty())
+                return;
+
         QString content("<span>%1</span>");
 
         body_ = new TextLabel(content.arg(replaceEmoji(body)), this);
@@ -512,8 +515,11 @@ TimelineItem::setupAvatarLayout(const QString &userName)
         headerLayout_->setMargin(0);
         headerLayout_->setSpacing(conf::timeline::headerSpacing);
 
-        headerLayout_->addWidget(userName_);
-        headerLayout_->addWidget(body_);
+        if (userName_)
+                headerLayout_->addWidget(userName_);
+
+        if (body_)
+                headerLayout_->addWidget(body_);
 }
 
 void
@@ -593,7 +599,7 @@ TimelineItem::addAvatar()
         // Restore widget's layout.
         if (widget) {
                 widgetLayout_ = new QHBoxLayout();
-                widgetLayout_->setMargin(0);
+                widgetLayout_->setContentsMargins(0, 2, 0, 2);
                 widgetLayout_->addWidget(widget);
                 widgetLayout_->addStretch(1);