diff options
author | Zach Hilman <DarkLordZach@users.noreply.github.com> | 2020-01-23 00:39:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-23 00:39:21 +0100 |
commit | d8e0d839bd9c958233e6c57ff7e35b783daaf2d5 (patch) | |
tree | 696731d9e95c6aa6bd05ef98cd95be5c9e81d61f | |
parent | Merge pull request #3330 from ReinUsesLisp/vk-blit-screen (diff) | |
parent | fix qss stylesheet whitespaces (diff) | |
download | yuzu-d8e0d839bd9c958233e6c57ff7e35b783daaf2d5.tar yuzu-d8e0d839bd9c958233e6c57ff7e35b783daaf2d5.tar.gz yuzu-d8e0d839bd9c958233e6c57ff7e35b783daaf2d5.tar.bz2 yuzu-d8e0d839bd9c958233e6c57ff7e35b783daaf2d5.tar.lz yuzu-d8e0d839bd9c958233e6c57ff7e35b783daaf2d5.tar.xz yuzu-d8e0d839bd9c958233e6c57ff7e35b783daaf2d5.tar.zst yuzu-d8e0d839bd9c958233e6c57ff7e35b783daaf2d5.zip |
-rw-r--r-- | dist/qt_themes/qdarkstyle/style.qss | 33 | ||||
-rw-r--r-- | src/yuzu/uisettings.cpp | 6 |
2 files changed, 20 insertions, 19 deletions
diff --git a/dist/qt_themes/qdarkstyle/style.qss b/dist/qt_themes/qdarkstyle/style.qss index 399c38dce..a3983b27e 100644 --- a/dist/qt_themes/qdarkstyle/style.qss +++ b/dist/qt_themes/qdarkstyle/style.qss @@ -181,7 +181,7 @@ QMenu::icon { } QMenu::item { - padding: 5px 30px 5px 30px; + padding: 5px 16px 5px 40px; border: 1px solid transparent; /* reserve space for selection border */ } @@ -192,12 +192,13 @@ QMenu::item:selected { QMenu::separator { height: 2px; - background: lightblue; + background: #76797C; margin-left: 10px; margin-right: 5px; } QMenu::indicator { + margin: 0 -26px 0 8px; width: 18px; height: 18px; } @@ -252,7 +253,7 @@ QWidget:disabled { } QAbstractItemView { - alternate-background-color: #31363b; + alternate-background-color: #2c2f32; color: #eff0f1; border: 1px solid #3A3939; border-radius: 2px; @@ -577,8 +578,6 @@ QTreeView:hover { } QComboBox:on { - padding-top: 3px; - padding-left: 4px; selection-background-color: #4a4a4a; } @@ -703,10 +702,10 @@ QTabBar::close-button:pressed { QTabBar::tab:top { color: #eff0f1; border: 1px solid #76797C; - border-bottom: 1px transparent black; + border-bottom: 2px transparent; background-color: #31363b; - padding: 5px; - min-width: 50px; + padding: 4px 16px 2px; + min-width: 38px; border-top-left-radius: 2px; border-top-right-radius: 2px; } @@ -1078,7 +1077,7 @@ QListView::item:selected:active { } QHeaderView { - background-color: #31363b; + background-color: #403F3F; border: 1px transparent; border-radius: 0px; margin: 0px; @@ -1086,30 +1085,32 @@ QHeaderView { } QHeaderView::section { - background-color: #31363b; + background-color: #232629; color: #eff0f1; - padding: 5px; - border: 1px solid #76797C; + padding: 0 5px; + border: 1px solid #403F3F; + border-bottom: 0; border-radius: 0px; text-align: center; } QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one { - border-top: 1px solid #76797C; + border-top: 1px solid #31363b; } QHeaderView::section::vertical { border-top: transparent; } +QHeaderView::section::horizontal, QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::only-one { - border-left: 1px solid #76797C; + border-left: transparent; } -QHeaderView::section::horizontal { - border-left: transparent; +QHeaderView::section::horizontal::last { + border-right: transparent; } QHeaderView::section:checked { diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cpp index 43bad9678..738c4b2fc 100644 --- a/src/yuzu/uisettings.cpp +++ b/src/yuzu/uisettings.cpp @@ -7,10 +7,10 @@ namespace UISettings { const Themes themes{{ - {"Default", "default"}, + {"Light", "default"}, + {"Light Colorful", "colorful"}, {"Dark", "qdarkstyle"}, - {"Colorful", "colorful"}, - {"Colorful Dark", "colorful_dark"}, + {"Dark Colorful", "colorful_dark"}, }}; Values values = {}; |