OmniNX/sphaira
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove seconds from the clock, fix long file name in info box for theme music.

Browse Source
This commit is contained in:
ITotalJustice
2025-07-31 01:41:07 +01:00
parent 79b52ed13e
commit 92d747a0f5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sphaira/source/app.cpp
View File

@@ -1621,7 +1621,7 @@ void App::DisplayThemeOptions(bool left_side) {
App::SetThemeMusicEnable(enable);
}, "Enable background music.\n"\
"Each theme can have it's own music file. "\
"If a theme does not set a music file, then /config/sphaira/themes/default_music.bfstm is loaded instead (if it exists)."_i18n);
"If a theme does not set a music file, the default music is loaded instead (if it exists)."_i18n);
options->Add<ui::SidebarEntryBool>("12 Hour Time"_i18n, App::Get12HourTimeEnable(), [](bool& enable){
App::Set12HourTimeEnable(enable);
@@ -1642,7 +1642,7 @@ void App::DisplayThemeOptions(bool left_side) {
} else {
download_default_music();
}
}, "Downloads the default background music for sphaira to /config/sphaira/themes/default_music.bfstm"_i18n);
}, "Downloads the default background music for sphaira."_i18n);
}
void App::DisplayNetworkOptions(bool left_side) {

6
sphaira/source/ui/menus/menu_base.cpp
View File

@@ -77,12 +77,12 @@ void MenuBase::Draw(NVGcontext* vg, Theme* theme) {
start_x -= spacing + (bounds[2] - bounds[0]); \
}
draw(ThemeEntryID_TEXT, 83, "%u\uFE6A", pdata.battery_percetange);
draw(ThemeEntryID_TEXT, 90, "%u\uFE6A", pdata.battery_percetange);
if (App::Get12HourTimeEnable()) {
draw(ThemeEntryID_TEXT, 175, "%02u:%02u:%02u %s", (pdata.tm.tm_hour == 0 || pdata.tm.tm_hour == 12) ? 12 : pdata.tm.tm_hour % 12, pdata.tm.tm_min, pdata.tm.tm_sec, (pdata.tm.tm_hour < 12) ? "AM" : "PM");
draw(ThemeEntryID_TEXT, 132, "%02u:%02u %s", (pdata.tm.tm_hour == 0 || pdata.tm.tm_hour == 12) ? 12 : pdata.tm.tm_hour % 12, pdata.tm.tm_min, (pdata.tm.tm_hour < 12) ? "AM" : "PM");
} else {
draw(ThemeEntryID_TEXT, 133, "%02u:%02u:%02u", pdata.tm.tm_hour, pdata.tm.tm_min, pdata.tm.tm_sec);
draw(ThemeEntryID_TEXT, 90, "%02u:%02u", pdata.tm.tm_hour, pdata.tm.tm_min);
}
if (pdata.ip) {