From 1e1032ec9420a29c85bdaa40c09c7e37d5d4989e Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 27 Feb 2021 20:43:41 +0100
Subject: [PATCH] attempt to fix some issues on comments feeds

---
 retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp   |  4 +++-
 retroshare-gui/src/gui/feeds/BoardsCommentsItem.ui    |  8 +++++++-
 retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp |  4 ++--
 retroshare-gui/src/gui/feeds/ChannelsCommentsItem.ui  | 11 ++++++++++-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
index 757d10ec5..670567f03 100644
--- a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
+++ b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
@@ -422,7 +422,9 @@ void BoardsCommentsItem::makeUpVote()
 
 void BoardsCommentsItem::setComment(const RsGxsComment& cmt)
 {
-	ui->commLabel->setText(RsHtml().formatText(NULL, QString::fromUtf8(cmt.mComment.c_str()), RSHTML_FORMATTEXT_EMBED_LINKS));
+	uint32_t autorized_lines = (int)floor((ui->avatarLabel->height() - ui->buttonHLayout->sizeHint().height())/QFontMetricsF(ui->subjectLabel->font()).height());
+
+	ui->commLabel->setText(RsHtml().formatText(NULL, RsStringUtil::CopyLines(QString::fromUtf8(cmt.mComment.c_str()), autorized_lines), RSHTML_FORMATTEXT_EMBED_LINKS));;
 
 	ui->nameLabel->setId(cmt.mMeta.mAuthorId);
 	ui->datetimeLabel->setText(DateTime::formatLongDateTime(cmt.mMeta.mPublishTs));
diff --git a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.ui b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.ui
index 5b244fe90..b3e529091 100644
--- a/retroshare-gui/src/gui/feeds/BoardsCommentsItem.ui
+++ b/retroshare-gui/src/gui/feeds/BoardsCommentsItem.ui
@@ -44,6 +44,9 @@
       <property name="topMargin">
        <number>9</number>
       </property>
+      <property name="verticalSpacing">
+       <number>3</number>
+      </property>
       <item row="2" column="1">
        <layout class="QHBoxLayout" name="buttonHLayout">
         <property name="spacing">
@@ -279,7 +282,7 @@
           <property name="sizeHint" stdset="0">
            <size>
             <width>20</width>
-            <height>10</height>
+            <height>6</height>
            </size>
           </property>
          </spacer>
@@ -377,6 +380,9 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
+         <property name="verticalSpacing">
+          <number>3</number>
+         </property>
          <item row="0" column="2">
           <spacer name="horizontalSpacer_3">
            <property name="orientation">
diff --git a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
index bfa33cde9..88b724598 100644
--- a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
@@ -305,7 +305,7 @@ void ChannelsCommentsItem::loadMessage()
 
 			RsQThreadUtils::postToObject( [cmt,this]()
 			{
-				uint32_t autorized_lines = (int)floor((ui->logoLabel->height() - ui->buttonHLayout->sizeHint().height())/QFontMetricsF(ui->subjectLabel->font()).height());
+				uint32_t autorized_lines = (int)floor((ui->avatarLabel->height() - ui->buttonHLayout->sizeHint().height())/QFontMetricsF(ui->subjectLabel->font()).height());
 
 				ui->commLabel->setText(RsHtml().formatText(NULL, RsStringUtil::CopyLines(QString::fromUtf8(cmt.mComment.c_str()), autorized_lines), RSHTML_FORMATTEXT_EMBED_LINKS));
 
@@ -434,7 +434,7 @@ void ChannelsCommentsItem::fill()
 		/* subject */
 		//ui->titleLabel->setText(QString::fromUtf8(mPost.mMeta.mMsgName.c_str()));
 
-		uint32_t autorized_lines = (int)floor((ui->logoLabel->height() - ui->buttonHLayout->sizeHint().height())/QFontMetricsF(ui->subjectLabel->font()).height());
+		uint32_t autorized_lines = (int)floor((ui->avatarLabel->height() - ui->buttonHLayout->sizeHint().height())/QFontMetricsF(ui->subjectLabel->font()).height());
 
 		// fill first 4 lines of message. (csoler) Disabled the replacement of smileys and links, because the cost is too crazy
 		//ui->subjectLabel->setText(RsHtml().formatText(NULL, RsStringUtil::CopyLines(QString::fromUtf8(mPost.mMsg.c_str()), autorized_lines), RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS));
diff --git a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.ui b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.ui
index c686adb3c..45c55b841 100644
--- a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.ui
+++ b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.ui
@@ -44,6 +44,12 @@
       <property name="topMargin">
        <number>9</number>
       </property>
+      <property name="horizontalSpacing">
+       <number>6</number>
+      </property>
+      <property name="verticalSpacing">
+       <number>3</number>
+      </property>
       <item row="2" column="1">
        <layout class="QHBoxLayout" name="buttonHLayout">
         <property name="spacing">
@@ -262,6 +268,9 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
+         <property name="verticalSpacing">
+          <number>3</number>
+         </property>
          <item row="0" column="2">
           <spacer name="horizontalSpacer_3">
            <property name="orientation">
@@ -391,7 +400,7 @@
           <property name="sizeHint" stdset="0">
            <size>
             <width>58</width>
-            <height>10</height>
+            <height>6</height>
            </size>
           </property>
          </spacer>