mirrors/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5077 from FearlessTobi/port-3339

Browse source 
Port yuzu-emu/yuzu#3339: "GUI: fix minor issues with dark themes + rename and reorder themes"
This commit is contained in:
James Rowe 2020-02-08 12:49:15 -07:00 committed by GitHub
commit 03cde53cb6
2 changed files with 127 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

245
dist/qt_themes/qdarkstyle/style.qss vendored
View file

@ -2,7 +2,8 @@ QToolTip {
border: 1px solid #76797C; border: 1px solid #76797C;
background-color: #5A7566; background-color: #5A7566;
color: white; color: white;
padding: 0px; /*remove padding, for fix combobox tooltip.*/ /*remove padding, for fix combobox tooltip.*/
padding: 0;
opacity: 200; opacity: 200;
} }
@ -13,7 +14,7 @@ QWidget {
selection-color: #eff0f1; selection-color: #eff0f1;
background-clip: border; background-clip: border;
border-image: none; border-image: none;
border: 0px transparent black; border: 0;
outline: 0; outline: 0;
} }
@ -27,10 +28,10 @@ QWidget:item:selected {
} }
QCheckBox { QCheckBox {
spacing: 5px; spacing: 6px;
outline: none; outline: none;
color: #eff0f1; color: #eff0f1;
margin-bottom: 2px; margin: 0 2px 1px 0;
} }
QCheckBox:disabled { QCheckBox:disabled {
@ -163,7 +164,7 @@ QMenuBar::item:selected {
} }
QMenuBar::item:pressed { QMenuBar::item:pressed {
border: 1px solid #76797C; border: 1px solid #18465d;
background-color: #3daee9; background-color: #3daee9;
color: #eff0f1; color: #eff0f1;
margin-bottom: -1px; margin-bottom: -1px;
@ -171,9 +172,9 @@ QMenuBar::item:pressed {
} }
QMenu { QMenu {
border: 1px solid #76797C; border: 1px solid #434242;
padding: 2px;
color: #eff0f1; color: #eff0f1;
margin: 2px;
} }
QMenu::icon { QMenu::icon {
@ -181,7 +182,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 */
} }
@ -190,22 +191,30 @@ QMenu::item:selected {
color: #eff0f1; color: #eff0f1;
} }
QMenu::separator { QMenu::item:disabled {
height: 2px; color: #54575B;
background: lightblue; }
margin-left: 10px;
margin-right: 5px; QMenu::item:disabled:hover,
QMenu::item:disabled:selected {
background-color: #393e43;
color: #666;
}
QMenu::separator,
QMenuBar::separator {
height: 1px;
background-color: #54575B;
margin: 2px 4px 2px 40px;
} }
QMenu::indicator { QMenu::indicator {
margin: 0 -26px 0 8px;
width: 18px; width: 18px;
height: 18px; height: 18px;
} }
/* non-exclusive indicator = check box style indicator (see QActionGroup::setExclusive) */
/* non-exclusive indicator = check box style indicator
(see QActionGroup::setExclusive) */
QMenu::indicator:non-exclusive:unchecked { QMenu::indicator:non-exclusive:unchecked {
image: url(:/qss_icons/rc/checkbox_unchecked.png); image: url(:/qss_icons/rc/checkbox_unchecked.png);
} }
@ -222,9 +231,7 @@ QMenu::indicator:non-exclusive:checked:selected {
image: url(:/qss_icons/rc/checkbox_checked_disabled.png); image: url(:/qss_icons/rc/checkbox_checked_disabled.png);
} }
/* exclusive indicator = radio button style indicator (see QActionGroup::setExclusive) */ /* exclusive indicator = radio button style indicator (see QActionGroup::setExclusive) */
QMenu::indicator:exclusive:unchecked { QMenu::indicator:exclusive:unchecked {
image: url(:/qss_icons/rc/radio_unchecked.png); image: url(:/qss_icons/rc/radio_unchecked.png);
} }
@ -242,39 +249,46 @@ QMenu::indicator:exclusive:checked:selected {
} }
QMenu::right-arrow { QMenu::right-arrow {
margin: 5px; margin-right: 10px;
image: url(:/qss_icons/rc/right_arrow.png) image: url(:/qss_icons/rc/right_arrow.png)
} }
QWidget:disabled { QWidget:disabled {
color: #454545; color: #4f515b;
background-color: #31363b; background-color: #31363b;
} }
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;
} }
QWidget:focus, QAbstractItemView:disabled,
QMenuBar:focus { QAbstractItemView:read-only {
alternate-background-color: #232629;
}
QWidget:focus {
border: 1px solid #3daee9; border: 1px solid #3daee9;
} }
QTabWidget:focus, QTabWidget:focus,
QCheckBox:focus, QCheckBox:focus,
QRadioButton:focus, QRadioButton:focus,
QSlider:focus { QSlider:focus,
QTreeView:focus,
QMenu:focus,
QMenuBar:focus,
QTabBar:focus {
border: none; border: none;
} }
QLineEdit { QLineEdit {
background-color: #232629; background-color: #232629;
padding: 5px; padding: 5px;
border-style: solid; border: 1px solid #54575B;
border: 1px solid #76797C;
border-radius: 2px; border-radius: 2px;
color: #eff0f1; color: #eff0f1;
} }
@ -284,9 +298,10 @@ QAbstractItemView QLineEdit {
} }
QGroupBox { QGroupBox {
border: 1px solid #76797C; border: 1px solid #54575B;
border-radius: 2px; border-radius: 2px;
margin-top: 20px; margin-top: 12px;
padding-top: 2px;
} }
QGroupBox::title { QGroupBox::title {
@ -294,12 +309,12 @@ QGroupBox::title {
subcontrol-position: top center; subcontrol-position: top center;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
padding-top: 10px; padding-top: 2px;
} }
QAbstractScrollArea { QAbstractScrollArea {
border-radius: 2px; border-radius: 2px;
border: 1px solid #76797C; border: 1px solid #54575B;
background-color: transparent; background-color: transparent;
} }
@ -318,7 +333,7 @@ QScrollBar::handle:horizontal {
} }
QScrollBar::add-line:horizontal { QScrollBar::add-line:horizontal {
margin: 0px 3px 0px 3px; margin: 0 3px;
border-image: url(:/qss_icons/rc/right_arrow_disabled.png); border-image: url(:/qss_icons/rc/right_arrow_disabled.png);
width: 10px; width: 10px;
height: 10px; height: 10px;
@ -327,7 +342,7 @@ QScrollBar::add-line:horizontal {
} }
QScrollBar::sub-line:horizontal { QScrollBar::sub-line:horizontal {
margin: 0px 3px 0px 3px; margin: 0 3px;
border-image: url(:/qss_icons/rc/left_arrow_disabled.png); border-image: url(:/qss_icons/rc/left_arrow_disabled.png);
height: 10px; height: 10px;
width: 10px; width: 10px;
@ -378,7 +393,7 @@ QScrollBar::handle:vertical {
} }
QScrollBar::sub-line:vertical { QScrollBar::sub-line:vertical {
margin: 3px 0px 3px 0px; margin: 3px 0;
border-image: url(:/qss_icons/rc/up_arrow_disabled.png); border-image: url(:/qss_icons/rc/up_arrow_disabled.png);
height: 10px; height: 10px;
width: 10px; width: 10px;
@ -387,7 +402,7 @@ QScrollBar::sub-line:vertical {
} }
QScrollBar::add-line:vertical { QScrollBar::add-line:vertical {
margin: 3px 0px 3px 0px; margin: 3px 0;
border-image: url(:/qss_icons/rc/down_arrow_disabled.png); border-image: url(:/qss_icons/rc/down_arrow_disabled.png);
height: 10px; height: 10px;
width: 10px; width: 10px;
@ -426,15 +441,14 @@ QScrollBar::sub-page:vertical {
QTextEdit { QTextEdit {
background-color: #232629; background-color: #232629;
color: #eff0f1; color: #eff0f1;
border: 1px solid #76797C; border: 1px solid #54575B;
} }
QPlainTextEdit { QPlainTextEdit {
background-color: #232629; background-color: #232629;
;
color: #eff0f1; color: #eff0f1;
border-radius: 2px; border-radius: 2px;
border: 1px solid #76797C; border: 1px solid #54575B;
} }
QHeaderView::section { QHeaderView::section {
@ -466,15 +480,6 @@ QMainWindow::separator:hover {
spacing: 2px; spacing: 2px;
} }
QMenu::separator {
height: 1px;
background-color: #76797C;
color: white;
padding-left: 4px;
margin-left: 10px;
margin-right: 5px;
}
QFrame { QFrame {
border-radius: 2px; border-radius: 2px;
border: 1px solid #76797C; border: 1px solid #76797C;
@ -517,25 +522,19 @@ QToolButton#qt_toolbar_ext_button {
QPushButton { QPushButton {
color: #eff0f1; color: #eff0f1;
background-color: #31363b;
border-width: 1px; border-width: 1px;
border-color: #76797C; border-color: #54575B;
border-style: solid; border-style: solid;
padding: 5px; padding: 6px 4px;
border-radius: 2px; border-radius: 2px;
outline: none; outline: none;
min-width: 100px;
background-color: #232629;
} }
QPushButton:disabled { QPushButton:disabled {
background-color: #31363b; background-color: #31363b;
border-width: 1px;
border-color: #454545; border-color: #454545;
border-style: solid;
padding-top: 5px;
padding-bottom: 5px;
padding-left: 10px;
padding-right: 10px;
border-radius: 2px;
color: #454545; color: #454545;
} }
@ -552,11 +551,11 @@ QPushButton:pressed {
QComboBox { QComboBox {
selection-background-color: #3daee9; selection-background-color: #3daee9;
border-style: solid; border: 1px solid #54575B;
border: 1px solid #76797C;
border-radius: 2px; border-radius: 2px;
padding: 5px; padding: 4px 6px;
min-width: 75px; min-width: 75px;
background-color: #232629;
} }
QPushButton:checked { QPushButton:checked {
@ -570,15 +569,12 @@ QAbstractSpinBox:hover,
QLineEdit:hover, QLineEdit:hover,
QTextEdit:hover, QTextEdit:hover,
QPlainTextEdit:hover, QPlainTextEdit:hover,
QAbstractView:hover, QAbstractView:hover {
QTreeView:hover {
border: 1px solid #3daee9; border: 1px solid #3daee9;
color: #eff0f1; color: #eff0f1;
} }
QComboBox:on { QComboBox:on {
padding-top: 3px;
padding-left: 4px;
selection-background-color: #4a4a4a; selection-background-color: #4a4a4a;
} }
@ -592,6 +588,7 @@ QComboBox QAbstractItemView {
QComboBox::drop-down { QComboBox::drop-down {
subcontrol-origin: padding; subcontrol-origin: padding;
subcontrol-position: top right; subcontrol-position: top right;
left: -6px;
width: 15px; width: 15px;
border-left-width: 0px; border-left-width: 0px;
border-left-color: darkgray; border-left-color: darkgray;
@ -611,8 +608,8 @@ QComboBox::down-arrow:focus {
} }
QAbstractSpinBox { QAbstractSpinBox {
padding: 5px; padding: 4px 6px;
border: 1px solid #76797C; border: 1px solid #54575B;
background-color: #232629; background-color: #232629;
color: #eff0f1; color: #eff0f1;
border-radius: 2px; border-radius: 2px;
@ -623,12 +620,14 @@ QAbstractSpinBox:up-button {
background-color: transparent; background-color: transparent;
subcontrol-origin: border; subcontrol-origin: border;
subcontrol-position: center right; subcontrol-position: center right;
left: -6px;
} }
QAbstractSpinBox:down-button { QAbstractSpinBox:down-button {
background-color: transparent; background-color: transparent;
subcontrol-origin: border; subcontrol-origin: border;
subcontrol-position: center left; subcontrol-position: center left;
right: -6px;
} }
QAbstractSpinBox::up-arrow, QAbstractSpinBox::up-arrow,
@ -655,22 +654,27 @@ QAbstractSpinBox::down-arrow:hover {
image: url(:/qss_icons/rc/down_arrow.png); image: url(:/qss_icons/rc/down_arrow.png);
} }
QLabel { QLabel,
border: 0px solid black; QTabWidget {
border: 0;
} }
QTabWidget { QTabWidget {
border: 0px transparent black; padding-top: 1px;
} }
QTabWidget::pane { QTabWidget::pane {
border: 1px solid #76797C; border: 1px solid #76797C;
padding: 5px; padding: 5px;
margin: 0px; position: absolute;
top: -1px;
border-top-right-radius: 2px;
border-bottom-right-radius: 2px;
border-bottom-left-radius: 2px;
} }
QTabWidget::tab-bar { QTabWidget::tab-bar {
/* left: 5px; move to the right by 5px */ overflow: visible;
} }
QTabBar { QTabBar {
@ -678,10 +682,6 @@ QTabBar {
border-radius: 3px; border-radius: 3px;
} }
QTabBar:focus {
border: 0px transparent black;
}
QTabBar::close-button { QTabBar::close-button {
image: url(:/qss_icons/rc/close.png); image: url(:/qss_icons/rc/close.png);
background: transparent; background: transparent;
@ -697,36 +697,33 @@ QTabBar::close-button:pressed {
background: transparent; background: transparent;
} }
/* TOP TABS */ /* TOP TABS */
QTabBar::tab:top { QTabBar::tab:top {
color: #eff0f1; color: #eff0f1;
border: 1px solid #76797C; border: 1px solid #54575B;
border-bottom: 1px transparent black; background-color: #2a2f33;
background-color: #31363b; padding: 4px 16px 5px;
padding: 5px; min-width: 36px;
min-width: 50px;
border-top-left-radius: 2px; border-top-left-radius: 2px;
border-top-right-radius: 2px; border-top-right-radius: 2px;
} }
QTabBar::tab:top:selected { QTabBar::tab:top:selected {
color: #eff0f1; border-color: #76797C;
background-color: #54575B; background-color: #31363b;
border: 1px solid #76797C; border-bottom-color: #31363b;
border-bottom: 2px solid #3daee9; }
border-top-left-radius: 2px;
border-top-right-radius: 2px; QTabBar::tab:top:!selected {
margin-top: 1px;
border-bottom-color: #76797C;
} }
QTabBar::tab:top:!selected:hover { QTabBar::tab:top:!selected:hover {
background-color: #3daee9; background-color: #3daee9;
} }
/* BOTTOM TABS */ /* BOTTOM TABS */
QTabBar::tab:bottom { QTabBar::tab:bottom {
color: #eff0f1; color: #eff0f1;
border: 1px solid #76797C; border: 1px solid #76797C;
@ -751,9 +748,7 @@ QTabBar::tab:bottom:!selected:hover {
background-color: #3daee9; background-color: #3daee9;
} }
/* LEFT TABS */ /* LEFT TABS */
QTabBar::tab:left { QTabBar::tab:left {
color: #eff0f1; color: #eff0f1;
border: 1px solid #76797C; border: 1px solid #76797C;
@ -778,9 +773,7 @@ QTabBar::tab:left:!selected:hover {
background-color: #3daee9; background-color: #3daee9;
} }
/* RIGHT TABS */ /* RIGHT TABS */
QTabBar::tab:right { QTabBar::tab:right {
color: #eff0f1; color: #eff0f1;
border: 1px solid #76797C; border: 1px solid #76797C;
@ -848,7 +841,7 @@ QDockWidget::float-button:pressed {
QTreeView, QTreeView,
QListView { QListView {
border: 1px solid #76797C; border: 1px solid #54575B;
background-color: #232629; background-color: #232629;
} }
@ -979,8 +972,8 @@ QSlider::handle:vertical {
} }
QToolButton { QToolButton {
background-color: transparent; background-color: #232629;
border: 1px transparent #76797C; border: 1px solid #54575B;
border-radius: 2px; border-radius: 2px;
margin: 3px; margin: 3px;
padding: 5px; padding: 5px;
@ -989,7 +982,6 @@ QToolButton {
QToolButton[popupMode="1"] { QToolButton[popupMode="1"] {
/* only for MenuButtonPopup */ /* only for MenuButtonPopup */
padding-right: 20px; padding-right: 20px;
/* make way for the popup button */
border: 1px #76797C; border: 1px #76797C;
border-radius: 5px; border-radius: 5px;
} }
@ -997,7 +989,6 @@ QToolButton[popupMode="1"] {
QToolButton[popupMode="2"] { QToolButton[popupMode="2"] {
/* only for InstantPopup */ /* only for InstantPopup */
padding-right: 10px; padding-right: 10px;
/* make way for the popup button */
border: 1px #76797C; border: 1px #76797C;
} }
@ -1016,19 +1007,14 @@ QToolButton::menu-button:pressed {
padding: 5px; padding: 5px;
} }
/* the subcontrol below is used only in the InstantPopup or DelayedPopup mode */ /* the subcontrol below is used only in the InstantPopup or DelayedPopup mode */
QToolButton::menu-indicator { QToolButton::menu-indicator {
image: url(:/qss_icons/rc/down_arrow.png); image: url(:/qss_icons/rc/down_arrow.png);
top: -7px; top: -7px;
left: -2px; left: -2px;
/* shift it a bit */
} }
/* the subcontrols below are used only in the MenuButtonPopup mode */ /* the subcontrols below are used only in the MenuButtonPopup mode */
QToolButton::menu-button { QToolButton::menu-button {
border: 1px transparent #76797C; border: 1px transparent #76797C;
border-top-right-radius: 6px; border-top-right-radius: 6px;
@ -1053,14 +1039,22 @@ QPushButton::menu-indicator {
} }
QTableView { QTableView {
border: 1px solid #76797C; border: 1px solid #54575B;
gridline-color: #31363b; gridline-color: #31363b;
background-color: #232629; background-color: #232629;
} }
QTreeView:disabled {
background-color: #1f2225;
}
QTableView, QTableView,
QHeaderView { QHeaderView {
border-radius: 0px; border-radius: 0;
}
QListView:focus {
border-color: #54575B;
} }
QTableView::item:pressed, QTableView::item:pressed,
@ -1078,7 +1072,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 +1080,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 #434242;
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 {
@ -1117,9 +1113,7 @@ QHeaderView::section:checked {
background-color: #334e5e; background-color: #334e5e;
} }
/* sort indicator */
/* style the sort indicator */
QHeaderView::down-arrow { QHeaderView::down-arrow {
image: url(:/qss_icons/rc/down_arrow.png); image: url(:/qss_icons/rc/down_arrow.png);
} }
@ -1149,14 +1143,13 @@ QToolBox::tab {
} }
QToolBox::tab:selected { QToolBox::tab:selected {
/* italicize selected tabs */
font: italic; font: italic;
background-color: #31363b; background-color: #31363b;
border-color: #3daee9; border-color: #3daee9;
} }
QStatusBar::item { QStatusBar::item {
border: 0px transparent dark; border: 0;
} }
QFrame[height="3"], QFrame[height="3"],
@ -1193,7 +1186,6 @@ QProgressBar::chunk {
QDateEdit { QDateEdit {
selection-background-color: #3daee9; selection-background-color: #3daee9;
border-style: solid;
border: 1px solid #3375A3; border: 1px solid #3375A3;
border-radius: 2px; border-radius: 2px;
padding: 1px; padding: 1px;
@ -1217,7 +1209,7 @@ QDateEdit::drop-down {
subcontrol-origin: padding; subcontrol-origin: padding;
subcontrol-position: top right; subcontrol-position: top right;
width: 15px; width: 15px;
border-left-width: 0px; border-left-width: 0;
border-left-color: darkgray; border-left-color: darkgray;
border-left-style: solid; border-left-style: solid;
border-top-right-radius: 3px; border-top-right-radius: 3px;
@ -1233,3 +1225,14 @@ QDateEdit::down-arrow:hover,
QDateEdit::down-arrow:focus { QDateEdit::down-arrow:focus {
image: url(:/qss_icons/rc/down_arrow.png); image: url(:/qss_icons/rc/down_arrow.png);
} }
QComboBox:disabled,
QPushButton:disabled,
QAbstractSpinBox:disabled,
QDateEdit:disabled,
QLineEdit:disabled,
QTextEdit:disabled,
QToolButton:disabled,
QPlainTextEdit:disabled {
background-color: #2b2e31;
}

6
src/citra_qt/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 = {};