From 1146a0bf2750641563a3a1a2effd611ce21651ca Mon Sep 17 00:00:00 2001
From: Phenom <retrosharephenom@gmail.com>
Date: Fri, 12 Nov 2021 19:28:48 +0100
Subject: [PATCH] Fix QSplitter and TitleBar StyleSheet.

---
 retroshare-gui/src/gui/chat/ChatWidget.cpp    |  2 +-
 retroshare-gui/src/gui/chat/ChatWidget.ui     |  4 +--
 .../src/gui/qss/stylesheet/Standard_Dark.qss  | 12 ++++----
 .../src/gui/qss/stylesheet/Standard_Light.qss | 29 ++++++++++++-------
 .../src/gui/qss/stylesheet/default.qss        | 28 ------------------
 5 files changed, 28 insertions(+), 47 deletions(-)

diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index d4a20fe74..a909e3e27 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -381,7 +381,7 @@ void ChatWidget::init(const ChatId &chat_id, const QString &title)
         hist_chat_type = RS_HISTORY_TYPE_PUBLIC;
         messageCount = Settings->getPublicChatHistoryCount();
 
-        ui->titleBarFrame->setVisible(false);
+        ui->headerBFrame->setVisible(false);
     }
 
 	if (rsHistory->getEnable(hist_chat_type))
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.ui b/retroshare-gui/src/gui/chat/ChatWidget.ui
index 88e501335..879c99d00 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.ui
+++ b/retroshare-gui/src/gui/chat/ChatWidget.ui
@@ -32,7 +32,7 @@
       <enum>QLayout::SetMaximumSize</enum>
      </property>
      <item>
-      <widget class="QFrame" name="titleBarFrame">
+      <widget class="QFrame" name="headerBFrame">
        <property name="minimumSize">
         <size>
          <width>0</width>
@@ -51,7 +51,7 @@
        <property name="frameShadow">
         <enum>QFrame::Plain</enum>
        </property>
-       <layout class="QHBoxLayout" name="titleBarFrameHLayout">
+       <layout class="QHBoxLayout" name="headerBFrameHLayout">
         <property name="leftMargin">
          <number>2</number>
         </property>
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss
index f2097d0be..fc95d1d46 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss
@@ -2248,13 +2248,13 @@ QTreeView:branch:selected:!active {
 /**** Fix QSplitter ****/
 
 QSplitter {
-  background-color: #19232D;
+  background-color: rgba(0,0,0,0);
 }
-
 QSplitter::handle {
-  background-color: #455364;
-  border: 0px solid #455364;
-  border-radius: 4px;
+  background-color: rgba(0,0,0,0);
+  border: 0px;
+  border-radius: 2px;
+  padding: 0px;
 }
 
 
@@ -2286,7 +2286,7 @@ QFrame#bottomFrame,/* Frame used at the bottom of dialog*/
 QFrame#toasterFrame,/* Frame used in Toasters*/
 QFrame#toolBarFrame {/* Frame used for buttons*/
 	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #19232D, stop:1 #32414B);
-	border: 1px solid #CCCCCC;
+	border: 1px solid #455364;
 }
 QFrame#toolBarFrame > LineEditClear {
 	background-color: #29333D;
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
index 85f601e3e..e6616c855 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
@@ -2248,13 +2248,13 @@ QTreeView:branch:selected:!active {
 /**** Fix QSplitter ****/
 
 QSplitter {
-  background-color: white;
+  background-color: rgba(0,0,0,0);
 }
-
 QSplitter::handle {
-  background-color: #C9CDD0;
-  border: 0px solid #C9CDD0;
-  border-radius: 4px;
+  background-color: rgba(0,0,0,0);
+  border: 0px;
+  border-radius: 2px;
+  padding: 0px;
 }
 
 
@@ -2307,12 +2307,11 @@ QLabel#avatarLabel{
 }
 
 
-/* HeaderFrame & TitleBarFrame */
+/* HeaderFrame */
 
 QFrame[objectName^="headerFrame"],
 QFrame[objectName^="headerBFrame"],
-QToolBar#headerToolBar,
-QFrame#titleBarFrame {
+QToolBar#headerToolBar {
 	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD);
 	border: 0px;
 }
@@ -2321,11 +2320,21 @@ QFrame[objectName^="#headerBFrame"] {
 	border-radius: 4px;
 }
 QFrame[objectName^="headerFrame"] > *:!hover,
-QFrame[objectName^="headerBFrame"] > *:!hover,
-QFrame#titleBarFrame > *:!hover {
+QFrame[objectName^="headerBFrame"] > *:!hover {
 	background: transparent;
 	color: white;
 }
+
+/* TitleBarFrame */
+
+QFrame#titleBarFrame {
+	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #F0F8FD, stop:1 #E6F2FD);
+	border: 0px;
+}
+QFrame#titleBarFrame > *:!hover {
+	background: transparent;
+	color: black;
+}
 QFrame#titleBarFrame QComboBox,
 QFrame#titleBarFrame QLineEdit,
 QFrame#titleBarFrame QTextEdit {
diff --git a/retroshare-gui/src/gui/qss/stylesheet/default.qss b/retroshare-gui/src/gui/qss/stylesheet/default.qss
index 40d0b06ea..d1730bfef 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/default.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/default.qss
@@ -418,31 +418,3 @@ OpModeStatus[opMode="Minimal"] {
 [WrongValue="true"] {
 	background-color: #FF8080;
 }
-
-/* HeaderFrame & TitleBarFrame */
-
-QFrame[objectName^="headerFrame"],
-QFrame[objectName^="headerBFrame"] {
-	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD);
-	border: 1px;
-	border-radius: 4px;
-}
-QFrame[objectName^="#headerBFrame"] {
-	border: 1px;
-	border-radius: 4px;
-}
-QFrame[objectName^="headerFrame"] > *:!hover,
-QFrame[objectName^="headerBFrame"] > *:!hover{
-	background: transparent;
-	color: white;
-}
-
-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;
-}
-
-ChatWidget QFrame#titleBarFrame {
-	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FEFEFE, stop:1 #E8E8E8);
-	border: 1px solid #CCCCCC;
-}