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

Add a few missing palette colors

Browse source
This commit is contained in:
Nicolas Werner 2020-04-08 23:08:43 +02:00
parent 31a5972f2a
commit 6794b6472d
5 changed files with 24 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/delegates/FileMessage.qml
View file

@ -3,7 +3,7 @@ import QtQuick.Layouts 1.2
Rectangle { Rectangle {
radius: 10 radius: 10
color: colors.base color: colors.dark
height: row.height + 24 height: row.height + 24
width: parent ? parent.width : undefined width: parent ? parent.width : undefined

2
resources/qml/delegates/PlayableMediaMessage.qml
View file

@ -8,7 +8,7 @@ import im.nheko 1.0
Rectangle { Rectangle {
id: bg id: bg
radius: 10 radius: 10
color: colors.base color: colors.dark
height: content.height + 24 height: content.height + 24
width: parent ? parent.width : undefined width: parent ? parent.width : undefined

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

@ -176,27 +176,6 @@ UserInfoWidget {
border-bottom: 1px solid #202228; border-bottom: 1px solid #202228;
} }
QPushButton,
QComboBox,
QAbstractItemView,
QComboBox > * {
background: white;
color: #202228;
}
QComboBox:hover,
QAbstractItemView::item:hover,
QPushButton:hover {
background: #38a3d8;
selection-background-color: #38a3d8;
}
QAbstractItemView::item:selected {
border-color: darkblue;
background: grey;
}
Avatar { Avatar {
qproperty-textColor: white; qproperty-textColor: white;
qproperty-backgroundColor: #2d3139; qproperty-backgroundColor: #2d3139;

12
resources/styles/nheko.qss
View file

@ -190,18 +190,6 @@ RegisterPage {
color: #333; color: #333;
} }
QComboBox:hover,
QAbstractItemView::item:hover,
QPushButton:hover {
background: #38a3d8;
selection-background-color: #38a3d8;
}
QAbstractItemView::item:selected {
border-color: darkblue;
background: grey;
}
emoji--Panel, emoji--Panel,
emoji--Panel > * { emoji--Panel > * {
background-color: #eee; background-color: #eee;

23
src/UserSettingsPage.cpp
View file

@ -106,15 +106,17 @@ UserSettings::applyTheme()
static QPalette original; static QPalette original;
if (this->theme() == "light") { if (this->theme() == "light") {
stylefile.setFileName(":/styles/styles/nheko.qss"); stylefile.setFileName(":/styles/styles/nheko.qss");
QPalette lightActive(/*windowText*/ QColor("#333"), QPalette lightActive(
/*windowText*/ QColor("#333"),
/*button*/ QColor("#333"), /*button*/ QColor("#333"),
/*light*/ QColor(), /*light*/ QColor(0xef, 0xef, 0xef),
/*dark*/ QColor(220, 220, 220), /*dark*/ QColor(220, 220, 220),
/*mid*/ QColor(), /*mid*/ QColor(0, 0xff, 0), // not used anywhere, this is for debugging
/*text*/ QColor("#333"), /*text*/ QColor("#333"),
/*bright_text*/ QColor(), /*bright_text*/ QColor("#333"),
/*base*/ QColor(220, 220, 220), /*base*/ QColor("white"),
/*window*/ QColor("white")); /*window*/ QColor("white"));
lightActive.setColor(QPalette::Highlight, QColor("#38a3d8"));
lightActive.setColor(QPalette::ToolTipBase, lightActive.base().color()); lightActive.setColor(QPalette::ToolTipBase, lightActive.base().color());
lightActive.setColor(QPalette::ToolTipText, lightActive.text().color()); lightActive.setColor(QPalette::ToolTipText, lightActive.text().color());
lightActive.setColor(QPalette::Link, QColor("#0077b5")); lightActive.setColor(QPalette::Link, QColor("#0077b5"));
@ -122,11 +124,12 @@ UserSettings::applyTheme()
QApplication::setPalette(lightActive); QApplication::setPalette(lightActive);
} else if (this->theme() == "dark") { } else if (this->theme() == "dark") {
stylefile.setFileName(":/styles/styles/nheko-dark.qss"); stylefile.setFileName(":/styles/styles/nheko-dark.qss");
QPalette darkActive(/*windowText*/ QColor("#caccd1"), QPalette darkActive(
/*button*/ QColor("#caccd1"), /*windowText*/ QColor("#caccd1"),
/*light*/ QColor(), /*button*/ QColor(0xff, 0xff, 0xff),
/*light*/ QColor("#caccd1"),
/*dark*/ QColor("#2d3139"), /*dark*/ QColor("#2d3139"),
/*mid*/ QColor(), /*mid*/ QColor(0, 0xff, 0), // not used anywhere, this is for debugging
/*text*/ QColor("#caccd1"), /*text*/ QColor("#caccd1"),
/*bright_text*/ QColor(0xff, 0xff, 0xff), /*bright_text*/ QColor(0xff, 0xff, 0xff),
/*base*/ QColor("#2d3139"), /*base*/ QColor("#2d3139"),
@ -135,7 +138,7 @@ UserSettings::applyTheme()
darkActive.setColor(QPalette::ToolTipBase, darkActive.base().color()); darkActive.setColor(QPalette::ToolTipBase, darkActive.base().color());
darkActive.setColor(QPalette::ToolTipText, darkActive.text().color()); darkActive.setColor(QPalette::ToolTipText, darkActive.text().color());
darkActive.setColor(QPalette::Link, QColor("#38a3d8")); darkActive.setColor(QPalette::Link, QColor("#38a3d8"));
darkActive.setColor(QPalette::ButtonText, QColor("gray")); darkActive.setColor(QPalette::ButtonText, QColor(77, 77, 77));
QApplication::setPalette(darkActive); QApplication::setPalette(darkActive);
} else { } else {
stylefile.setFileName(":/styles/styles/system.qss"); stylefile.setFileName(":/styles/styles/system.qss");