Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2510 from PhenomRetroShare/Fix_QSplitter_TitleBar_StyleSheet

Browse Source 
Fix QSplitter and TitleBar StyleSheet.
This commit is contained in:
G10h4ck 2021-11-20 16:26:18 +01:00 committed by GitHub
commit cf56059a6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/chat/ChatWidget.cpp
View File

@ -381,7 +381,7 @@ void ChatWidget::init(const ChatId &chat_id, const QString &title)
hist_chat_type = RS_HISTORY_TYPE_PUBLIC; hist_chat_type = RS_HISTORY_TYPE_PUBLIC;
messageCount = Settings->getPublicChatHistoryCount(); messageCount = Settings->getPublicChatHistoryCount();
ui->titleBarFrame->setVisible(false); ui->headerBFrame->setVisible(false);
} }
if (rsHistory->getEnable(hist_chat_type)) if (rsHistory->getEnable(hist_chat_type))

4
retroshare-gui/src/gui/chat/ChatWidget.ui
View File

@ -32,7 +32,7 @@
<enum>QLayout::SetMaximumSize</enum> <enum>QLayout::SetMaximumSize</enum>
</property> </property>
<item> <item>
<widget class="QFrame" name="titleBarFrame"> <widget class="QFrame" name="headerBFrame">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -51,7 +51,7 @@
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Plain</enum> <enum>QFrame::Plain</enum>
</property> </property>
<layout class="QHBoxLayout" name="titleBarFrameHLayout"> <layout class="QHBoxLayout" name="headerBFrameHLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>2</number> <number>2</number>
</property> </property>

12
retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss
View File

@ -2248,13 +2248,13 @@ QTreeView:branch:selected:!active {
/**** Fix QSplitter ****/ /**** Fix QSplitter ****/
QSplitter { QSplitter {
background-color: #19232D; background-color: rgba(0,0,0,0);
} }
QSplitter::handle { QSplitter::handle {
background-color: #455364; background-color: rgba(0,0,0,0);
border: 0px solid #455364; border: 0px;
border-radius: 4px; 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#toasterFrame,/* Frame used in Toasters*/
QFrame#toolBarFrame {/* Frame used for buttons*/ QFrame#toolBarFrame {/* Frame used for buttons*/
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #19232D, stop:1 #32414B); 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 { QFrame#toolBarFrame > LineEditClear {
background-color: #29333D; background-color: #29333D;

29
retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
View File

@ -2248,13 +2248,13 @@ QTreeView:branch:selected:!active {
/**** Fix QSplitter ****/ /**** Fix QSplitter ****/
QSplitter { QSplitter {
background-color: white; background-color: rgba(0,0,0,0);
} }
QSplitter::handle { QSplitter::handle {
background-color: #C9CDD0; background-color: rgba(0,0,0,0);
border: 0px solid #C9CDD0; border: 0px;
border-radius: 4px; border-radius: 2px;
padding: 0px;
} }
@ -2307,12 +2307,11 @@ QLabel#avatarLabel{
} }
/* HeaderFrame & TitleBarFrame */ /* HeaderFrame */
QFrame[objectName^="headerFrame"], QFrame[objectName^="headerFrame"],
QFrame[objectName^="headerBFrame"], QFrame[objectName^="headerBFrame"],
QToolBar#headerToolBar, QToolBar#headerToolBar {
QFrame#titleBarFrame {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD); background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD);
border: 0px; border: 0px;
} }
@ -2321,11 +2320,21 @@ QFrame[objectName^="#headerBFrame"] {
border-radius: 4px; border-radius: 4px;
} }
QFrame[objectName^="headerFrame"] > *:!hover, QFrame[objectName^="headerFrame"] > *:!hover,
QFrame[objectName^="headerBFrame"] > *:!hover, QFrame[objectName^="headerBFrame"] > *:!hover {
QFrame#titleBarFrame > *:!hover {
background: transparent; background: transparent;
color: white; 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 QComboBox,
QFrame#titleBarFrame QLineEdit, QFrame#titleBarFrame QLineEdit,
QFrame#titleBarFrame QTextEdit { QFrame#titleBarFrame QTextEdit {

28
retroshare-gui/src/gui/qss/stylesheet/default.qss
View File

@ -418,31 +418,3 @@ OpModeStatus[opMode="Minimal"] {
[WrongValue="true"] { [WrongValue="true"] {
background-color: #FF8080; 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;
}