yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #3339 from Simek/dark-theme-update 

GUI: fix minor issues with dark themes + rename and reorder themes
This commit is contained in:
Zach Hilman 2020-01-22 18:39:21 -05:00 committed by GitHub
parent 79e0991d9b c7055f3670
commit d8e0d839bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dist/qt_themes/qdarkstyle/style.qss vendored
View File

@ -181,7 +181,7 @@ QMenu::icon {
} }
QMenu::item { QMenu::item {
padding: 5px 30px 5px 30px; padding: 5px 16px 5px 40px;
border: 1px solid transparent; border: 1px solid transparent;
/* reserve space for selection border */ /* reserve space for selection border */
} }
@ -192,12 +192,13 @@ QMenu::item:selected {
QMenu::separator { QMenu::separator {
height: 2px; height: 2px;
background: lightblue; background: #76797C;
margin-left: 10px; margin-left: 10px;
margin-right: 5px; margin-right: 5px;
} }
QMenu::indicator { QMenu::indicator {
margin: 0 -26px 0 8px;
width: 18px; width: 18px;
height: 18px; height: 18px;
} }
@ -252,7 +253,7 @@ QWidget:disabled {
} }
QAbstractItemView { QAbstractItemView {
alternate-background-color: #31363b; alternate-background-color: #2c2f32;
color: #eff0f1; color: #eff0f1;
border: 1px solid #3A3939; border: 1px solid #3A3939;
border-radius: 2px; border-radius: 2px;
@ -577,8 +578,6 @@ QTreeView:hover {
} }
QComboBox:on { QComboBox:on {
padding-top: 3px;
padding-left: 4px;
selection-background-color: #4a4a4a; selection-background-color: #4a4a4a;
} }
@ -703,10 +702,10 @@ QTabBar::close-button:pressed {
QTabBar::tab:top { QTabBar::tab:top {
color: #eff0f1; color: #eff0f1;
border: 1px solid #76797C; border: 1px solid #76797C;
border-bottom: 1px transparent black; border-bottom: 2px transparent;
background-color: #31363b; background-color: #31363b;
padding: 5px; padding: 4px 16px 2px;
min-width: 50px; min-width: 38px;
border-top-left-radius: 2px; border-top-left-radius: 2px;
border-top-right-radius: 2px; border-top-right-radius: 2px;
} }
@ -1078,7 +1077,7 @@ QListView::item:selected:active {
} }
QHeaderView { QHeaderView {
background-color: #31363b; background-color: #403F3F;
border: 1px transparent; border: 1px transparent;
border-radius: 0px; border-radius: 0px;
margin: 0px; margin: 0px;
@ -1086,30 +1085,32 @@ QHeaderView {
} }
QHeaderView::section { QHeaderView::section {
background-color: #31363b; background-color: #232629;
color: #eff0f1; color: #eff0f1;
padding: 5px; padding: 0 5px;
border: 1px solid #76797C; border: 1px solid #403F3F;
border-bottom: 0;
border-radius: 0px; border-radius: 0px;
text-align: center; text-align: center;
} }
QHeaderView::section::vertical::first, QHeaderView::section::vertical::first,
QHeaderView::section::vertical::only-one { QHeaderView::section::vertical::only-one {
border-top: 1px solid #76797C; border-top: 1px solid #31363b;
} }
QHeaderView::section::vertical { QHeaderView::section::vertical {
border-top: transparent; border-top: transparent;
} }
QHeaderView::section::horizontal,
QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::first,
QHeaderView::section::horizontal::only-one { QHeaderView::section::horizontal::only-one {
border-left: 1px solid #76797C; border-left: transparent;
} }
QHeaderView::section::horizontal { QHeaderView::section::horizontal::last {
border-left: transparent; border-right: transparent;
} }
QHeaderView::section:checked { QHeaderView::section:checked {

6
src/yuzu/uisettings.cpp
View File

@ -7,10 +7,10 @@
namespace UISettings { namespace UISettings {
const Themes themes{{ const Themes themes{{
{"Default", "default"}, {"Light", "default"},
{"Light Colorful", "colorful"},
{"Dark", "qdarkstyle"}, {"Dark", "qdarkstyle"},
{"Colorful", "colorful"}, {"Dark Colorful", "colorful_dark"},
{"Colorful Dark", "colorful_dark"},
}}; }};
Values values = {}; Values values = {};