diff --git a/src/core/fullscreen_ui.cpp b/src/core/fullscreen_ui.cpp index 5c66487c9..ce0b74aa3 100644 --- a/src/core/fullscreen_ui.cpp +++ b/src/core/fullscreen_ui.cpp @@ -3692,10 +3692,11 @@ void FullscreenUI::DrawInterfaceSettingsPage() static constexpr const char* s_theme_name[] = { FSUI_NSTR("Dark"), FSUI_NSTR("Light"), FSUI_NSTR("AMOLED"), FSUI_NSTR("Cobalt Sky"), FSUI_NSTR("Grey Matter"), FSUI_NSTR("Pinky Pals"), + FSUI_NSTR("Purple Rain") }; static constexpr const char* s_theme_value[] = { - "Dark", "Light", "AMOLED", "CobaltSky", "GreyMatter", "PinkyPals", + "Dark", "Light", "AMOLED", "CobaltSky", "GreyMatter", "PinkyPals", "PurpleRain" }; BeginMenuButtons(); diff --git a/src/duckstation-qt/interfacesettingswidget.cpp b/src/duckstation-qt/interfacesettingswidget.cpp index 0030b6cdb..cef612f11 100644 --- a/src/duckstation-qt/interfacesettingswidget.cpp +++ b/src/duckstation-qt/interfacesettingswidget.cpp @@ -18,6 +18,7 @@ const char* InterfaceSettingsWidget::THEME_NAMES[] = { QT_TRANSLATE_NOOP("MainWindow", "Dark Fusion (Gray)"), QT_TRANSLATE_NOOP("MainWindow", "Dark Fusion (Blue)"), QT_TRANSLATE_NOOP("MainWindow", "Cobalt Sky"), + QT_TRANSLATE_NOOP("MainWindow", "Pinky Pals"), QT_TRANSLATE_NOOP("MainWindow", "Grey Matter"), QT_TRANSLATE_NOOP("MainWindow", "AMOLED"), QT_TRANSLATE_NOOP("MainWindow", "Dark Ruby"), @@ -35,6 +36,7 @@ const char* InterfaceSettingsWidget::THEME_VALUES[] = { "darkfusion", "darkfusionblue", "cobaltsky", + "pinkypals", "greymatter", "AMOLED", "darkruby", diff --git a/src/duckstation-qt/qtthemes.cpp b/src/duckstation-qt/qtthemes.cpp index 5fed94b10..0db844da6 100644 --- a/src/duckstation-qt/qtthemes.cpp +++ b/src/duckstation-qt/qtthemes.cpp @@ -199,6 +199,39 @@ void QtHost::SetStyleFromSettings() qApp->setPalette(darkPalette); qApp->setStyleSheet(QString()); } + else if (theme == "pinkypals") + { + qApp->setStyle(QStyleFactory::create("Fusion")); + + const QColor black(25, 25, 25); + const QColor pink(255, 174, 201); + const QColor darkerPink(214, 145, 168); + const QColor brightPink(224, 88, 133); + const QColor congoPink(255, 127, 121); + + QPalette PinkyPalsPalette; + PinkyPalsPalette.setColor(QPalette::Window, pink); + PinkyPalsPalette.setColor(QPalette::WindowText, black); + PinkyPalsPalette.setColor(QPalette::Base, darkerPink); + PinkyPalsPalette.setColor(QPalette::AlternateBase, brightPink); + PinkyPalsPalette.setColor(QPalette::ToolTipBase, pink); + PinkyPalsPalette.setColor(QPalette::ToolTipText, darkerPink); + PinkyPalsPalette.setColor(QPalette::Text, black); + PinkyPalsPalette.setColor(QPalette::Button, pink); + PinkyPalsPalette.setColor(QPalette::ButtonText, black); + PinkyPalsPalette.setColor(QPalette::Link, black); + PinkyPalsPalette.setColor(QPalette::Highlight, congoPink); + PinkyPalsPalette.setColor(QPalette::HighlightedText, black); + + PinkyPalsPalette.setColor(QPalette::Active, QPalette::Button, pink); + PinkyPalsPalette.setColor(QPalette::Disabled, QPalette::ButtonText, QColor(Qt::white).darker()); + PinkyPalsPalette.setColor(QPalette::Disabled, QPalette::WindowText, QColor(Qt::white).darker()); + PinkyPalsPalette.setColor(QPalette::Disabled, QPalette::Text, QColor(Qt::white).darker()); + PinkyPalsPalette.setColor(QPalette::Disabled, QPalette::Light, QColor(Qt::white).darker()); + + qApp->setPalette(PinkyPalsPalette); + qApp->setStyleSheet(QString()); + } else if (theme == "AMOLED") { // Custom palette by KamFretoZ, A pure concentrated darkness diff --git a/src/util/imgui_fullscreen.cpp b/src/util/imgui_fullscreen.cpp index 241a1a462..4ef779b17 100644 --- a/src/util/imgui_fullscreen.cpp +++ b/src/util/imgui_fullscreen.cpp @@ -3453,7 +3453,7 @@ void ImGuiFullscreen::SetTheme(std::string_view theme) UIStyle.SecondaryStrongColor = HEX_TO_IMVEC4(0x245dda, 0xff); UIStyle.SecondaryWeakColor = HEX_TO_IMVEC4(0x3a3d7b, 0xff); UIStyle.SecondaryTextColor = HEX_TO_IMVEC4(0xffffff, 0xff); - UIStyle.ToastBackgroundColor = HEX_TO_IMVEC4(0x282828, 0xff); + UIStyle.ToastBackgroundColor = HEX_TO_IMVEC4(0x2d4183, 0xff); UIStyle.ToastTextColor = HEX_TO_IMVEC4(0xffffff, 0xff); UIStyle.ShadowColor = IM_COL32(0, 0, 0, 100); } @@ -3482,7 +3482,7 @@ void ImGuiFullscreen::SetTheme(std::string_view theme) } else if (theme == "PinkyPals") { - UIStyle.BackgroundColor = HEX_TO_IMVEC4(0xeba0b9, 0xff); + UIStyle.BackgroundColor = HEX_TO_IMVEC4(0xd692a9, 0xff); UIStyle.BackgroundTextColor = HEX_TO_IMVEC4(0x000000, 0xff); UIStyle.BackgroundLineColor = HEX_TO_IMVEC4(0xe05885, 0xff); UIStyle.BackgroundHighlight = HEX_TO_IMVEC4(0xe05885, 0xff); @@ -3499,7 +3499,30 @@ void ImGuiFullscreen::SetTheme(std::string_view theme) UIStyle.SecondaryStrongColor = HEX_TO_IMVEC4(0xdc6c68, 0xff); UIStyle.SecondaryWeakColor = HEX_TO_IMVEC4(0xab5451, 0xff); UIStyle.SecondaryTextColor = HEX_TO_IMVEC4(0x000000, 0xff); - UIStyle.ToastBackgroundColor = HEX_TO_IMVEC4(0x282828, 0xff); + UIStyle.ToastBackgroundColor = HEX_TO_IMVEC4(0xd86a66, 0xff); + UIStyle.ToastTextColor = HEX_TO_IMVEC4(0xffffff, 0xff); + UIStyle.ShadowColor = IM_COL32(100, 100, 100, 50); + } + else if (theme == "PurpleRain") + { + UIStyle.BackgroundColor = HEX_TO_IMVEC4(0x341d56, 0xff); + UIStyle.BackgroundTextColor = HEX_TO_IMVEC4(0xffffff, 0xff); + UIStyle.BackgroundLineColor = HEX_TO_IMVEC4(0xa78936, 0xff); + UIStyle.BackgroundHighlight = HEX_TO_IMVEC4(0xa78936, 0xff); + UIStyle.PopupFrameBackgroundColor = HEX_TO_IMVEC4(0x341d56, 0xf2); + UIStyle.PopupBackgroundColor = HEX_TO_IMVEC4(0x532f8a, 0xf2); + UIStyle.PrimaryColor = HEX_TO_IMVEC4(0x49297a, 0xff); + UIStyle.PrimaryLightColor = HEX_TO_IMVEC4(0x653aab, 0xff); + UIStyle.PrimaryDarkColor = HEX_TO_IMVEC4(0x462876, 0xff); + UIStyle.PrimaryTextColor = HEX_TO_IMVEC4(0xffffff, 0xff); + UIStyle.DisabledColor = HEX_TO_IMVEC4(0x8d8d8d, 0xff); + UIStyle.TextHighlightColor = HEX_TO_IMVEC4(0x000000, 0xff); + UIStyle.PrimaryLineColor = HEX_TO_IMVEC4(0xffffff, 0xff); + UIStyle.SecondaryColor = HEX_TO_IMVEC4(0x523a74, 0xff); + UIStyle.SecondaryStrongColor = HEX_TO_IMVEC4(0x8d65ca, 0xff); + UIStyle.SecondaryWeakColor = HEX_TO_IMVEC4(0xab5451, 0xff); + UIStyle.SecondaryTextColor = HEX_TO_IMVEC4(0xffffff, 0xff); + UIStyle.ToastBackgroundColor = HEX_TO_IMVEC4(0x8e65cb, 0xff); UIStyle.ToastTextColor = HEX_TO_IMVEC4(0xffffff, 0xff); UIStyle.ShadowColor = IM_COL32(100, 100, 100, 50); }