starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-14 10:24:37 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

FullscreenUI: Fix misdetection of some light themes

Browse Source
This commit is contained in:
Stenzek
2025-11-04 22:00:39 +10:00
parent a5e20511d9
commit 2a350960bf
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/fullscreenui_widgets.cpp
View File

@@ -5026,6 +5026,7 @@ void FullscreenUI::UpdateTheme()
UIStyle.ToastBackgroundColor = HEX_TO_IMVEC4(0x282828, 0xff);
UIStyle.ToastTextColor = HEX_TO_IMVEC4(0xffffff, 0xff);
UIStyle.ShadowColor = IM_COL32(0, 0, 0, 100);
UIStyle.IsDarkTheme = true;
}
else if (theme == "CobaltSky")
{
@@ -5049,6 +5050,7 @@ void FullscreenUI::UpdateTheme()
UIStyle.ToastBackgroundColor = HEX_TO_IMVEC4(0x2d4183, 0xff);
UIStyle.ToastTextColor = HEX_TO_IMVEC4(0xffffff, 0xff);
UIStyle.ShadowColor = IM_COL32(0, 0, 0, 100);
UIStyle.IsDarkTheme = true;
}
else if (theme == "GreyMatter")
{
@@ -5072,6 +5074,7 @@ void FullscreenUI::UpdateTheme()
UIStyle.ToastBackgroundColor = HEX_TO_IMVEC4(0x282828, 0xff);
UIStyle.ToastTextColor = HEX_TO_IMVEC4(0xffffff, 0xff);
UIStyle.ShadowColor = IM_COL32(0, 0, 0, 100);
UIStyle.IsDarkTheme = true;
}
else if (theme == "PinkyPals")
{
@@ -5095,6 +5098,7 @@ void FullscreenUI::UpdateTheme()
UIStyle.ToastBackgroundColor = HEX_TO_IMVEC4(0xd86a66, 0xff);
UIStyle.ToastTextColor = HEX_TO_IMVEC4(0xffffff, 0xff);
UIStyle.ShadowColor = IM_COL32(100, 100, 100, 50);
UIStyle.IsDarkTheme = false;
}
else if (theme == "GreenGiant")
{
@@ -5117,6 +5121,7 @@ void FullscreenUI::UpdateTheme()
UIStyle.ToastBackgroundColor = HEX_TO_IMVEC4(0xD5DE2E, 0xff);
UIStyle.ToastTextColor = HEX_TO_IMVEC4(0x000000, 0xff);
UIStyle.ShadowColor = IM_COL32(100, 100, 100, 50);
UIStyle.IsDarkTheme = false;
}
else if (theme == "DarkRuby")
{
@@ -5140,6 +5145,7 @@ void FullscreenUI::UpdateTheme()
UIStyle.ToastBackgroundColor = HEX_TO_IMVEC4(0x282828, 0xff);
UIStyle.ToastTextColor = HEX_TO_IMVEC4(0xffffff, 0xff);
UIStyle.ShadowColor = IM_COL32(0, 0, 0, 100);
UIStyle.IsDarkTheme = true;
}
else if (theme == "PurpleRain")
{
@@ -5163,6 +5169,7 @@ void FullscreenUI::UpdateTheme()
UIStyle.ToastBackgroundColor = HEX_TO_IMVEC4(0x8e65cb, 0xff);
UIStyle.ToastTextColor = HEX_TO_IMVEC4(0xffffff, 0xff);
UIStyle.ShadowColor = IM_COL32(100, 100, 100, 50);
UIStyle.IsDarkTheme = true;
}
else if (theme == "Light")
{
@@ -5187,6 +5194,7 @@ void FullscreenUI::UpdateTheme()
UIStyle.ToastBackgroundColor = HEX_TO_IMVEC4(0xf1f1f1, 0xff);
UIStyle.ToastTextColor = HEX_TO_IMVEC4(0x000000, 0xff);
UIStyle.ShadowColor = IM_COL32(100, 100, 100, 50);
UIStyle.IsDarkTheme = false;
}
else
{
@@ -5211,5 +5219,6 @@ void FullscreenUI::UpdateTheme()
UIStyle.ToastBackgroundColor = HEX_TO_IMVEC4(0x282828, 0xff);
UIStyle.ToastTextColor = HEX_TO_IMVEC4(0xffffff, 0xff);
UIStyle.ShadowColor = IM_COL32(0, 0, 0, 100);
UIStyle.IsDarkTheme = true;
}
}

4
src/core/fullscreenui_widgets.h
View File

@@ -106,6 +106,7 @@ struct ALIGN_TO_CACHE_LINE UIStyles
bool Animations;
bool SmoothScrolling;
bool MenuBorders;
bool IsDarkTheme;
};
extern UIStyles UIStyle;
@@ -150,8 +151,7 @@ ALWAYS_INLINE u32 ModAlpha(u32 col32, float a)
// lighter in light themes
ALWAYS_INLINE ImVec4 DarkerColor(const ImVec4& v, float f = 0.8f)
{
// light theme
f = (UIStyle.PrimaryTextColor.x < UIStyle.PrimaryColor.x) ? (1.0f / f) : f;
f = UIStyle.IsDarkTheme ? f : (1.0f / f);
return ImVec4(std::max(v.x, 1.0f / 255.0f) * f, std::max(v.y, 1.0f / 255.0f) * f, std::max(v.z, 1.0f / 255.0f) * f,
v.w);
}