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

remove old theme entries, make "Back" be the default hovered option when installing forwarder

Browse Source
This commit is contained in:
ITotalJustice
2024-12-16 22:51:58 +00:00
parent 34a44f3717
commit d063ffcb20
4 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sphaira/include/ui/types.hpp
View File

@@ -144,10 +144,8 @@ struct ElementEntry {
enum ThemeEntryID { enum ThemeEntryID {
ThemeEntryID_BACKGROUND, ThemeEntryID_BACKGROUND,
ThemeEntryID_LOGO,
ThemeEntryID_GRID, ThemeEntryID_GRID,
ThemeEntryID_GRID_HOVER,
ThemeEntryID_SELECTED, ThemeEntryID_SELECTED,
ThemeEntryID_SELECTED_OVERLAY, ThemeEntryID_SELECTED_OVERLAY,
ThemeEntryID_TEXT, ThemeEntryID_TEXT,

4
sphaira/source/app.cpp
View File

@@ -738,12 +738,8 @@ void App::LoadTheme(const fs::FsPath& path) {
app->PlaySoundEffect(SoundEffect_Music); app->PlaySoundEffect(SoundEffect_Music);
} }
} }
} else if (key == "logo") {
theme.elements[ThemeEntryID_LOGO] = app->LoadElement(value);
} else if (key == "grid") { } else if (key == "grid") {
theme.elements[ThemeEntryID_GRID] = app->LoadElement(value); theme.elements[ThemeEntryID_GRID] = app->LoadElement(value);
} else if (key == "grid_hover") {
theme.elements[ThemeEntryID_GRID_HOVER] = app->LoadElement(value);
} else if (key == "selected") { } else if (key == "selected") {
theme.elements[ThemeEntryID_SELECTED] = app->LoadElement(value); theme.elements[ThemeEntryID_SELECTED] = app->LoadElement(value);
} else if (key == "selected_overlay") { } else if (key == "selected_overlay") {

2
sphaira/source/ui/menus/filebrowser.cpp
View File

@@ -653,7 +653,7 @@ Menu::Menu(const std::vector<NroEntry>& nro_entries) : MenuBase{"FileBrowser"_i1
#if 1 #if 1
App::Push(std::make_shared<OptionBox>( App::Push(std::make_shared<OptionBox>(
"WARNING: Installing forwarders will lead to a ban!"_i18n, "WARNING: Installing forwarders will lead to a ban!"_i18n,
"Back"_i18n, "Install"_i18n, 1, [this](auto op_index){ "Back"_i18n, "Install"_i18n, 0, [this](auto op_index){
if (op_index && *op_index) { if (op_index && *op_index) {
InstallForwarder(); InstallForwarder();
} }

2
sphaira/source/ui/menus/homebrew.cpp
View File

@@ -153,7 +153,7 @@ Menu::Menu() : MenuBase{"Homebrew"_i18n} {
options->Add(std::make_shared<SidebarEntryCallback>("Install Forwarder"_i18n, [this](){ options->Add(std::make_shared<SidebarEntryCallback>("Install Forwarder"_i18n, [this](){
App::Push(std::make_shared<OptionBox>( App::Push(std::make_shared<OptionBox>(
"WARNING: Installing forwarders will lead to a ban!"_i18n, "WARNING: Installing forwarders will lead to a ban!"_i18n,
"Back"_i18n, "Install"_i18n, 1, [this](auto op_index){ "Back"_i18n, "Install"_i18n, 0, [this](auto op_index){
if (op_index && *op_index) { if (op_index && *op_index) {
InstallHomebrew(); InstallHomebrew();
} }