From ad4dd4802655474a7c087acc8f7b9a64a2871400 Mon Sep 17 00:00:00 2001
From: Niklas080208 <epicniklas3@gmail.com>
Date: Fri, 6 Feb 2026 22:06:01 +0100
Subject: [PATCH] Fix storage bar colours when theme uses custom background
 image

The header storage bar (microSD/System) used ThemeEntryID_BACKGROUND and ThemeEntryID_TEXT_INFO. When a theme sets background to an image path, no colour is set for that entry, so the bar got an unset/default colour (often white) and looked wrong on dark themes. Use PROGRESSBAR and PROGRESSBAR_BACKGROUND for the bar so it always uses theme colours that are defined as colours, not images.
---
 .DS_Store                             | Bin 0 -> 8196 bytes
 sphaira/source/ui/menus/menu_base.cpp |  13 +++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..6668f5e2f72566ba17de1e5544751fa5532dfe2b
GIT binary patch
literal 8196
zcmeHMYiJ!s6rOMM=x(znlQc;;P1@WVA2nKyu`#u^<u*xe(=<)Yqe)X~a_`->S={WV
zckjKa?;t3O7SUhg3;d-b78MmAe*~>oMSo~SDk4%Jh#&}xzXUxqvnfr}{1dTu2WGyR
zbLPzMoc+!YXO}UCj=X&}V-{mfrz((_QFE3e^r9{*S|lkV1lcoYdtsq7?FH#Yb7Mj5
zf!G7F2VxJz9*8~g-|zsP*`nx6ocl@}x3LFe51f}C5buWsRe{L}XBEm<2Q@MUAS@=a
zEYznwK-wfCOh!1XP@2-3Dtka=iYUc^GADgPOeai6IIB>ZGbnS0=*oyP6v(TST|!Q0
zNGgom*aNW#7JESC?j<bE^2}x4>G^w6TYB1a!(2<tSI~-zOG=mN#_}@r0&8e^@5rb*
z&Z`QpGt)Pna|1uz>tsX1ab6Kl1~c86!0*pGLO+rTy!@0Oj`PY)%FE=vRL<Gvd4uk4
z4#_IQOg8Ym{vdS4GW$kz&f%QUEmDn+g+VsgDHj`cX?-<|=R;?}p+((-(?v^%)o1Jw
z#?kVX4QnrMzG}mDTRLvowP&t^S5}#3P3=g*4c)Zo>`R3i$G2Vo;P8xV=O)Ko+wpVm
z&90L*j7nTF<fo>bxr$0&Wz|{rI&acP^J(``-p$=QSH&wUR$GncO*UP-H?W13t@GCm
zskzW<wDt>4XV#(C)^#bq#9C(#g|tbXr_{vD&GqKcEv|1HJXDevv(*~*QfbFCxUJ0E
z%yw&}p!{s`9wppl)>xyNU}}nPIW&}PtCh44h|BIyg}J_I#}~JBT<JPVHx^E&vQFQO
z?_{Gp+CftJ=twS%w%cwl5K6i0MyprX_lX6!*|uZPRaNqezJ7}=xa$|(966sJ2SGmM
zpXs{ZH2(;ilFh2y^p5|n?8!|wC0mr(pjZBC*2=orZZ^TP>~?m9J;t74ud-w8ef9<W
zhW*HXWq$zBP=r#Hp&B(<2@7k{jCO3qCTvC*`f(!$upbjhAp;vz$Rb1@1>B8$aUbr-
z19%jV;|V;4r|~Ra!pnFCZ{s6;j8E_>zQjp<hwt$V{?eERZMjyanOd#ZsI_Vvv^MQp
ztzAoM-P(XQqD`n<*P>I1jj8c`tEH&7Fr22<=P>Q)*~6(}$Ik9uJ?Bn1ohTOpw4%DE
zc4b0D)y6H`P7zQscAliCQ(y9ZL6k@;$k;lAt8-S}s`>_VP2*AlI!uA$9M(l_@@3KN
zri*k66kZYy*Ih=#9$u=34ePJeDJZ!nhh{_TH3o$qFN%ii+i3_jFgIUsP!RIsx%#?Q
z)>d<k$(dn9%XDq0WsdWIjNvEPN%j*l{7+(dIaUy_FGUNnx&u402YtlrK@8&n#);W!
z$!i}04iUHSz@4}Yv$zKj;vpQt!+1pU`$@^~=kPpUz>9btZ{SV5g?I5Dj^P7*NR0m+
zU*iY-jNi`Saqm2X72@}WJT44oeJ}72l60Q=3k~AYIp_g#_EWJ${=a?c@BeaA+{7M;
zJ@EhZ0E)W?yE<rZOTF7guAQJdK~)qnZ&sl+p+=_Tgfbl`JoUqn`U#pUY?2YqDkKS&
SfBi#1eE!GhzhvI|-TV#J&E$Xp

literal 0
HcmV?d00001

diff --git a/sphaira/source/ui/menus/menu_base.cpp b/sphaira/source/ui/menus/menu_base.cpp
index ef31897..49780eb 100644
--- a/sphaira/source/ui/menus/menu_base.cpp
+++ b/sphaira/source/ui/menus/menu_base.cpp
@@ -91,21 +91,22 @@ void MenuBase::Draw(NVGcontext* vg, Theme* theme) {
 
     gfx::drawTextArgs(vg, storage_x, storage_y, storage_font, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_TEXT), "System %.1f GB"_i18n.c_str(), pdata.emmc_free / 1024.0 / 1024.0 / 1024.0);
     // gfx::drawTextArgs(vg, storage_x, storage_y, storage_font, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_TEXT), "eMMC %.1f GB"_i18n.c_str(), pdata.emmc_free / 1024.0 / 1024.0 / 1024.0);
+    // Use progressbar colours (never BACKGROUND) so themes with custom background images work
     #if 0
     Vec4 prog_bar{storage_x, storage_y + 24, STORAGE_BAR_W, STORAGE_BAR_H};
     gfx::drawRect(vg, prog_bar, theme->GetColour(ThemeEntryID_PROGRESSBAR_BACKGROUND), rounding);
     gfx::drawRect(vg, prog_bar.x, prog_bar.y, ((double)pdata.emmc_free / (double)pdata.emmc_total) * prog_bar.w, prog_bar.h, theme->GetColour(ThemeEntryID_PROGRESSBAR), rounding);
     #else
-    gfx::drawRect(vg, storage_x, storage_y + 24, STORAGE_BAR_W, STORAGE_BAR_H, theme->GetColour(ThemeEntryID_TEXT_INFO), rounding);
-    gfx::drawRect(vg, storage_x + 1, storage_y + 24 + 1, STORAGE_BAR_W - 2, STORAGE_BAR_H - 2, theme->GetColour(ThemeEntryID_BACKGROUND), rounding);
-    gfx::drawRect(vg, storage_x + 2, storage_y + 24 + 2, STORAGE_BAR_W - (((double)pdata.emmc_free / (double)pdata.emmc_total) * STORAGE_BAR_W) - 4, STORAGE_BAR_H - 4, theme->GetColour(ThemeEntryID_TEXT_INFO), rounding);
+    gfx::drawRect(vg, storage_x, storage_y + 24, STORAGE_BAR_W, STORAGE_BAR_H, theme->GetColour(ThemeEntryID_PROGRESSBAR), rounding);
+    gfx::drawRect(vg, storage_x + 1, storage_y + 24 + 1, STORAGE_BAR_W - 2, STORAGE_BAR_H - 2, theme->GetColour(ThemeEntryID_PROGRESSBAR_BACKGROUND), rounding);
+    gfx::drawRect(vg, storage_x + 2, storage_y + 24 + 2, STORAGE_BAR_W - (((double)pdata.emmc_free / (double)pdata.emmc_total) * STORAGE_BAR_W) - 4, STORAGE_BAR_H - 4, theme->GetColour(ThemeEntryID_PROGRESSBAR), rounding);
     #endif
 
     storage_x -= (STORAGE_BAR_W + spacing);
     gfx::drawTextArgs(vg, storage_x, storage_y, storage_font, NVG_ALIGN_LEFT | NVG_ALIGN_TOP, theme->GetColour(ThemeEntryID_TEXT), "microSD %.1f GB"_i18n.c_str(), pdata.sd_free / 1024.0 / 1024.0 / 1024.0);
-    gfx::drawRect(vg, storage_x, storage_y + 24, STORAGE_BAR_W, STORAGE_BAR_H, theme->GetColour(ThemeEntryID_TEXT_INFO), rounding);
-    gfx::drawRect(vg, storage_x + 1, storage_y + 24 + 1, STORAGE_BAR_W - 2, STORAGE_BAR_H - 2, theme->GetColour(ThemeEntryID_BACKGROUND), rounding);
-    gfx::drawRect(vg, storage_x + 2, storage_y + 24 + 2, STORAGE_BAR_W - (((double)pdata.sd_free / (double)pdata.sd_total) * STORAGE_BAR_W) - 4, STORAGE_BAR_H - 4, theme->GetColour(ThemeEntryID_TEXT_INFO), rounding);
+    gfx::drawRect(vg, storage_x, storage_y + 24, STORAGE_BAR_W, STORAGE_BAR_H, theme->GetColour(ThemeEntryID_PROGRESSBAR), rounding);
+    gfx::drawRect(vg, storage_x + 1, storage_y + 24 + 1, STORAGE_BAR_W - 2, STORAGE_BAR_H - 2, theme->GetColour(ThemeEntryID_PROGRESSBAR_BACKGROUND), rounding);
+    gfx::drawRect(vg, storage_x + 2, storage_y + 24 + 2, STORAGE_BAR_W - (((double)pdata.sd_free / (double)pdata.sd_total) * STORAGE_BAR_W) - 4, STORAGE_BAR_H - 4, theme->GetColour(ThemeEntryID_PROGRESSBAR), rounding);
     start_x -= (STORAGE_BAR_W + spacing) * 2;
 
     // ran out of space, its one or the other.