From e5c9c47c91a2e5a96c712a373b0ac5eb971cd598 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 5 Dec 2020 23:06:02 +0100
Subject: [PATCH 1/2] Fixing background selection color & fixed the default
 width

* Fixing background selection color for Peer Online Feeds & Friend Request Feeds (Fusion style)
* Fixed the default width for GXS Group Dialog.
* Fixed spacing for the Button layout
---
 retroshare-gui/src/gui/feeds/PeerItem.ui     |  7 +++++--
 retroshare-gui/src/gui/feeds/SecurityItem.ui | 13 ++++++++-----
 retroshare-gui/src/gui/gxs/GxsGroupDialog.ui |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/PeerItem.ui b/retroshare-gui/src/gui/feeds/PeerItem.ui
index 27c38211f..1b5e93420 100644
--- a/retroshare-gui/src/gui/feeds/PeerItem.ui
+++ b/retroshare-gui/src/gui/feeds/PeerItem.ui
@@ -10,6 +10,9 @@
     <height>262</height>
    </rect>
   </property>
+  <property name="autoFillBackground">
+   <bool>false</bool>
+  </property>
   <layout class="QGridLayout" name="PeerItemGLayout">
    <property name="leftMargin">
     <number>1</number>
@@ -32,7 +35,7 @@
       </sizepolicy>
      </property>
      <property name="autoFillBackground">
-      <bool>false</bool>
+      <bool>true</bool>
      </property>
      <property name="frameShape">
       <enum>QFrame::Box</enum>
@@ -494,7 +497,7 @@
   </layout>
   <action name="actionNew_Message">
    <property name="icon">
-    <iconset resource="../images.qrc">
+    <iconset>
      <normaloff>:/images/mail_send.png</normaloff>:/images/mail_send.png</iconset>
    </property>
    <property name="text">
diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.ui b/retroshare-gui/src/gui/feeds/SecurityItem.ui
index 54bb46645..89ead4aee 100644
--- a/retroshare-gui/src/gui/feeds/SecurityItem.ui
+++ b/retroshare-gui/src/gui/feeds/SecurityItem.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1196</width>
-    <height>491</height>
+    <width>1015</width>
+    <height>246</height>
    </rect>
   </property>
   <layout class="QGridLayout">
@@ -32,7 +32,7 @@
       </sizepolicy>
      </property>
      <property name="autoFillBackground">
-      <bool>false</bool>
+      <bool>true</bool>
      </property>
      <property name="frameShape">
       <enum>QFrame::Box</enum>
@@ -165,6 +165,9 @@
          </item>
          <item row="1" column="1" colspan="2">
           <layout class="QHBoxLayout" name="horizontalLayout_3">
+           <property name="spacing">
+            <number>6</number>
+           </property>
            <item>
             <widget class="QToolButton" name="friendRequesttoolButton">
              <property name="focusPolicy">
@@ -277,7 +280,7 @@
               <string>Start Chat</string>
              </property>
              <property name="icon">
-              <iconset resource="../images.qrc">
+              <iconset>
                <normaloff>:/images/chat_24.png</normaloff>:/images/chat_24.png</iconset>
              </property>
              <property name="toolButtonStyle">
@@ -556,7 +559,7 @@
   </layout>
   <action name="actionNew_Message">
    <property name="icon">
-    <iconset resource="../images.qrc">
+    <iconset>
      <normaloff>:/images/mail_send.png</normaloff>:/images/mail_send.png</iconset>
    </property>
    <property name="text">
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
index e9ffcbb4d..e6da1441e 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1231</width>
+    <width>701</width>
     <height>529</height>
    </rect>
   </property>

From 5341db5afef64d6ba7efdbce0c080b39ff864257 Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sun, 6 Dec 2020 15:10:50 +0100
Subject: [PATCH 2/2] Fixed comments to open the Post & fixed background
 selection color issue on Fusion style

* Fixed Comments Button to open the Post
* Fixed background selection color issue on Fusion style
* Fixed issue when exapnding the Notes Text
---
 retroshare-gui/src/gui/Posted/PostedItem.cpp | 14 ++++++++------
 retroshare-gui/src/gui/Posted/PostedItem.ui  |  9 +++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/retroshare-gui/src/gui/Posted/PostedItem.cpp b/retroshare-gui/src/gui/Posted/PostedItem.cpp
index 6f9bc1cc3..4b9a0c91c 100644
--- a/retroshare-gui/src/gui/Posted/PostedItem.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedItem.cpp
@@ -35,6 +35,7 @@
 #include "gui/MainWindow.h"
 #include "gui/Identity/IdDialog.h"
 #include "PhotoView.h"
+#include "gui/Posted/PostedDialog.h"
 #include "ui_PostedItem.h"
 
 #include <retroshare/rsposted.h>
@@ -266,14 +267,14 @@ void BasePostedItem::loadComments()
 
 	if (mFeedHolder)
 	{
-		QString title = QString::fromUtf8(mPost.mMeta.mMsgName.c_str());
+		/* window will destroy itself! */
+		PostedDialog *postedDialog = dynamic_cast<PostedDialog*>(MainWindow::getPage(MainWindow::Posted));
 
-#warning (csoler) Posted item versions not handled yet. When it is the case, start here.
+		if (!postedDialog)
+			return ;
 
-        QVector<RsGxsMessageId> post_versions ;
-        post_versions.push_back(mPost.mMeta.mMsgId) ;
-
-		mFeedHolder->openComments(0, mPost.mMeta.mGroupId, post_versions,mPost.mMeta.mMsgId, title);
+		MainWindow::showWindow(MainWindow::Posted);
+		postedDialog->navigate(mPost.mMeta.mGroupId, mPost.mMeta.mMsgId) ;
 	}
 }
 void BasePostedItem::readToggled(bool checked)
@@ -740,4 +741,5 @@ void PostedItem::toggleNotes()
 		ui->frame_notes->hide();
 	}
 
+	emit sizeChanged(this);
 }
diff --git a/retroshare-gui/src/gui/Posted/PostedItem.ui b/retroshare-gui/src/gui/Posted/PostedItem.ui
index f7c69008f..4c011c121 100644
--- a/retroshare-gui/src/gui/Posted/PostedItem.ui
+++ b/retroshare-gui/src/gui/Posted/PostedItem.ui
@@ -611,6 +611,9 @@
        <height>600</height>
       </size>
      </property>
+     <property name="autoFillBackground">
+      <bool>true</bool>
+     </property>
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -662,6 +665,9 @@
    </item>
    <item row="2" column="0">
     <widget class="QFrame" name="frame_notes">
+     <property name="autoFillBackground">
+      <bool>true</bool>
+     </property>
      <property name="frameShape">
       <enum>QFrame::Box</enum>
      </property>
@@ -686,6 +692,9 @@
       </property>
       <item row="0" column="0" colspan="2">
        <widget class="QLabel" name="notes">
+        <property name="autoFillBackground">
+         <bool>false</bool>
+        </property>
         <property name="text">
          <string/>
         </property>