From 92d747a0f59db565019a48df8ff49839e32d1a81 Mon Sep 17 00:00:00 2001 From: ITotalJustice <47043333+ITotalJustice@users.noreply.github.com> Date: Thu, 31 Jul 2025 01:41:07 +0100 Subject: [PATCH] remove seconds from the clock, fix long file name in info box for theme music. --- sphaira/source/app.cpp | 4 ++-- sphaira/source/ui/menus/menu_base.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sphaira/source/app.cpp b/sphaira/source/app.cpp index 4f3421f..3fa6b6a 100644 --- a/sphaira/source/app.cpp +++ b/sphaira/source/app.cpp @@ -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("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) { diff --git a/sphaira/source/ui/menus/menu_base.cpp b/sphaira/source/ui/menus/menu_base.cpp index e8f4e93..4cabb91 100644 --- a/sphaira/source/ui/menus/menu_base.cpp +++ b/sphaira/source/ui/menus/menu_base.cpp @@ -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) {