From d78811ab5e058e69d0ac7eabcd122f27a232938a Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Sat, 5 Oct 2019 16:02:44 +0200
Subject: [PATCH] Fixed the toolbar frames

before used wrong names for the default stylesheet
---
 plugins/FeedReader/gui/FeedReaderDialog.ui    | 34 ++++++++++++++-----
 retroshare-gui/src/gui/chat/ChatWidget.ui     |  2 +-
 .../src/gui/qss/stylesheet/Standard.qss       |  2 +-
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/plugins/FeedReader/gui/FeedReaderDialog.ui b/plugins/FeedReader/gui/FeedReaderDialog.ui
index 124f3a032..7c77717bb 100644
--- a/plugins/FeedReader/gui/FeedReaderDialog.ui
+++ b/plugins/FeedReader/gui/FeedReaderDialog.ui
@@ -39,14 +39,23 @@
        </size>
       </property>
       <layout class="QGridLayout">
-       <property name="margin">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
         <number>0</number>
        </property>
        <property name="spacing">
         <number>0</number>
        </property>
        <item row="0" column="0">
-        <widget class="QFrame" name="titleBarFrame">
+        <widget class="QFrame" name="toolBarFrame">
          <property name="frameShape">
           <enum>QFrame::Box</enum>
          </property>
@@ -54,7 +63,16 @@
           <enum>QFrame::Sunken</enum>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_4">
-          <property name="margin">
+          <property name="leftMargin">
+           <number>2</number>
+          </property>
+          <property name="topMargin">
+           <number>2</number>
+          </property>
+          <property name="rightMargin">
+           <number>2</number>
+          </property>
+          <property name="bottomMargin">
            <number>2</number>
           </property>
           <item>
@@ -160,6 +178,11 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>StyledLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/common/StyledLabel.h</header>
+  </customwidget>
   <customwidget>
    <class>RSTreeWidget</class>
    <extends>QTreeWidget</extends>
@@ -171,11 +194,6 @@
    <header>gui/common/RSTabWidget.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>StyledLabel</class>
-   <extends>QLabel</extends>
-   <header>gui/common/StyledLabel.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="FeedReader_images.qrc"/>
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.ui b/retroshare-gui/src/gui/chat/ChatWidget.ui
index a937bf247..34ee50e53 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.ui
+++ b/retroshare-gui/src/gui/chat/ChatWidget.ui
@@ -303,7 +303,7 @@ border-image: url(:/images/closepressed.png)
          </widget>
         </item>
         <item>
-         <widget class="QFrame" name="toolBarFrame">
+         <widget class="QFrame" name="toolBarFrameTop">
           <property name="frameShape">
            <enum>QFrame::Box</enum>
           </property>
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index 99d4aa59e..05670f863 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -2,7 +2,7 @@
 
 /* Standard rules */
 
-QFrame#toolBarFrame {
+QFrame#toolBarFrame, QFrame#toolBarFrameTop {
 	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FEFEFE, stop:1 #E8E8E8);
 	border: 1px solid #CCCCCC;
 }