diff options
| author | 2019-10-03 21:34:40 -0400 | |
|---|---|---|
| committer | 2019-10-03 21:34:40 -0400 | |
| commit | c81872851334ffbb6690e20ada876d877aff5af8 (patch) | |
| tree | 7a90ed215899506468f4f386bd2b17b1b43ee46b /src | |
| parent | Merge pull request #2539 from DarkLordZach/bcat (diff) | |
| parent | qt_themes: add two colorful themes (diff) | |
| download | yuzu-c81872851334ffbb6690e20ada876d877aff5af8.tar.gz yuzu-c81872851334ffbb6690e20ada876d877aff5af8.tar.xz yuzu-c81872851334ffbb6690e20ada876d877aff5af8.zip | |
Merge pull request #2898 from FearlessTobi/port-4004
Port citra-emu/citra#4004: "qt_themes: add two colorful themes"
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/uisettings.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/uisettings.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cpp index 7f7d247a3..43bad9678 100644 --- a/src/yuzu/uisettings.cpp +++ b/src/yuzu/uisettings.cpp | |||
| @@ -9,6 +9,8 @@ namespace UISettings { | |||
| 9 | const Themes themes{{ | 9 | const Themes themes{{ |
| 10 | {"Default", "default"}, | 10 | {"Default", "default"}, |
| 11 | {"Dark", "qdarkstyle"}, | 11 | {"Dark", "qdarkstyle"}, |
| 12 | {"Colorful", "colorful"}, | ||
| 13 | {"Colorful Dark", "colorful_dark"}, | ||
| 12 | }}; | 14 | }}; |
| 13 | 15 | ||
| 14 | Values values = {}; | 16 | Values values = {}; |
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h index c57290006..a8eaf5f8c 100644 --- a/src/yuzu/uisettings.h +++ b/src/yuzu/uisettings.h | |||
| @@ -24,7 +24,7 @@ struct Shortcut { | |||
| 24 | ContextualShortcut shortcut; | 24 | ContextualShortcut shortcut; |
| 25 | }; | 25 | }; |
| 26 | 26 | ||
| 27 | using Themes = std::array<std::pair<const char*, const char*>, 2>; | 27 | using Themes = std::array<std::pair<const char*, const char*>, 4>; |
| 28 | extern const Themes themes; | 28 | extern const Themes themes; |
| 29 | 29 | ||
| 30 | struct GameDir { | 30 | struct GameDir { |