From 7e01311061bde87a6cd6cf35fe3c9a5d5ee4709d Mon Sep 17 00:00:00 2001 From: James Rowe Date: Sat, 18 Jul 2020 09:23:20 -0400 Subject: qt-themes: Add Midnight Blue qdarkstyle theme (2.8.1) Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> --- src/yuzu/uisettings.cpp | 2 ++ src/yuzu/uisettings.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cpp index 738c4b2fc..a51175f36 100644 --- a/src/yuzu/uisettings.cpp +++ b/src/yuzu/uisettings.cpp @@ -11,6 +11,8 @@ const Themes themes{{ {"Light Colorful", "colorful"}, {"Dark", "qdarkstyle"}, {"Dark Colorful", "colorful_dark"}, + {"Midnight Blue", "qdarkstyle_midnight_blue"}, + {"Midnight Blue Colorful", "colorful_midnight_blue"}, }}; Values values = {}; diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h index 6cc65736d..ac7b9aef6 100644 --- a/src/yuzu/uisettings.h +++ b/src/yuzu/uisettings.h @@ -24,7 +24,7 @@ struct Shortcut { ContextualShortcut shortcut; }; -using Themes = std::array, 4>; +using Themes = std::array, 6>; extern const Themes themes; struct GameDir { -- cgit v1.2.3 From d942472cce1f1fe6ab126ee787264f9f44c9ff65 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Sun, 19 Jul 2020 03:00:34 -0400 Subject: wait_tree: Include Midnight Blue dark themes --- src/yuzu/debugger/wait_tree.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp index f391a41a9..3439cb333 100644 --- a/src/yuzu/debugger/wait_tree.cpp +++ b/src/yuzu/debugger/wait_tree.cpp @@ -38,7 +38,10 @@ constexpr std::array, 10> WaitTreeColors{{ bool IsDarkTheme() { const auto& theme = UISettings::values.theme; - return theme == QStringLiteral("qdarkstyle") || theme == QStringLiteral("colorful_dark"); + return theme == QStringLiteral("qdarkstyle") || + theme == QStringLiteral("qdarkstyle_midnight_blue") || + theme == QStringLiteral("colorful_dark") || + theme == QStringLiteral("colorful_midnight_blue"); } } // namespace -- cgit v1.2.3