d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tooltip and Combobox bugs with Breeze / Dark theme

Browse source 
setStyleSheet was overriding default tooltip theme from the system,
causing themes like Breeze to render white text on a grey bg for
tooltips. Tooltips now render default for the system theme everywhere.

set a theme matching color on the dark theme comboboxes.

fixes #118
This commit is contained in:
Adasauce 2020-02-20 15:51:07 -04:00
parent fcaec0d099
commit 8b8b844bda
No known key found for this signature in database
GPG key ID: B4FD3151235211CB
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/styles/nheko-dark.qss
View file

@ -78,9 +78,11 @@ TypingDisplay {
CommunitiesList, CommunitiesList,
CommunitiesList > * { CommunitiesList > * {
border-style: none;
background-color: #2d3139; background-color: #2d3139;
} }
FlatButton { FlatButton {
qproperty-foregroundColor: #727274; qproperty-foregroundColor: #727274;
qproperty-backgroundColor: #333; qproperty-backgroundColor: #333;
@ -193,6 +195,10 @@ UserSettingsPage {
background-color: #202228; background-color: #202228;
} }
#UserSettingScrollWidget > QComboBox {
color: #202228;
}
Avatar { Avatar {
qproperty-textColor: white; qproperty-textColor: white;
qproperty-backgroundColor: #2d3139; qproperty-backgroundColor: #2d3139;

1
resources/styles/nheko.qss
View file

@ -78,6 +78,7 @@ RoomList > * {
CommunitiesList, CommunitiesList,
CommunitiesList > * { CommunitiesList > * {
border-style: none;
background-color: #2e3649; background-color: #2e3649;
} }

5
resources/styles/system.qss
View file

@ -124,6 +124,11 @@ RoomInfoListItem, UserMentionsWidget {
qproperty-bubbleFgColor: palette(text); qproperty-bubbleFgColor: palette(text);
} }
CommunitiesList,
CommunitiesList > * {
border-style: none;
}
CommunitiesListItem { CommunitiesListItem {
qproperty-highlightedBackgroundColor: palette(highlight); qproperty-highlightedBackgroundColor: palette(highlight);
qproperty-hoverBackgroundColor: palette(light); qproperty-hoverBackgroundColor: palette(light);

2
src/CommunitiesList.cpp
View file

@ -16,8 +16,6 @@ CommunitiesList::CommunitiesList(QWidget *parent)
sizePolicy.setVerticalStretch(1); sizePolicy.setVerticalStretch(1);
setSizePolicy(sizePolicy); setSizePolicy(sizePolicy);
setStyleSheet("border-style: none;");
topLayout_ = new QVBoxLayout(this); topLayout_ = new QVBoxLayout(this);
topLayout_->setSpacing(0); topLayout_->setSpacing(0);
topLayout_->setMargin(0); topLayout_->setMargin(0);