From d063ffcb2059e65ae0f170c614189cd5a5886506 Mon Sep 17 00:00:00 2001
From: ITotalJustice <47043333+ITotalJustice@users.noreply.github.com>
Date: Mon, 16 Dec 2024 22:51:58 +0000
Subject: [PATCH] remove old theme entries, make "Back" be the default hovered
 option when installing forwarder

---
 sphaira/include/ui/types.hpp            | 2 --
 sphaira/source/app.cpp                  | 4 ----
 sphaira/source/ui/menus/filebrowser.cpp | 2 +-
 sphaira/source/ui/menus/homebrew.cpp    | 2 +-
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/sphaira/include/ui/types.hpp b/sphaira/include/ui/types.hpp
index ea2f0c2..4eae5ea 100644
--- a/sphaira/include/ui/types.hpp
+++ b/sphaira/include/ui/types.hpp
@@ -144,10 +144,8 @@ struct ElementEntry {
 
 enum ThemeEntryID {
     ThemeEntryID_BACKGROUND,
-    ThemeEntryID_LOGO,
 
     ThemeEntryID_GRID,
-    ThemeEntryID_GRID_HOVER,
     ThemeEntryID_SELECTED,
     ThemeEntryID_SELECTED_OVERLAY,
     ThemeEntryID_TEXT,
diff --git a/sphaira/source/app.cpp b/sphaira/source/app.cpp
index a9a0c81..b4bb565 100644
--- a/sphaira/source/app.cpp
+++ b/sphaira/source/app.cpp
@@ -738,12 +738,8 @@ void App::LoadTheme(const fs::FsPath& path) {
                         app->PlaySoundEffect(SoundEffect_Music);
                     }
                 }
-            } else if (key == "logo") {
-                theme.elements[ThemeEntryID_LOGO] = app->LoadElement(value);
             } else if (key == "grid") {
                 theme.elements[ThemeEntryID_GRID] = app->LoadElement(value);
-            } else if (key == "grid_hover") {
-                theme.elements[ThemeEntryID_GRID_HOVER] = app->LoadElement(value);
             } else if (key == "selected") {
                 theme.elements[ThemeEntryID_SELECTED] = app->LoadElement(value);
             } else if (key == "selected_overlay") {
diff --git a/sphaira/source/ui/menus/filebrowser.cpp b/sphaira/source/ui/menus/filebrowser.cpp
index 5afffe2..2b536ac 100644
--- a/sphaira/source/ui/menus/filebrowser.cpp
+++ b/sphaira/source/ui/menus/filebrowser.cpp
@@ -653,7 +653,7 @@ Menu::Menu(const std::vector<NroEntry>& nro_entries) : MenuBase{"FileBrowser"_i1
                             #if 1
                             App::Push(std::make_shared<OptionBox>(
                                 "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) {
                                         InstallForwarder();
                                     }
diff --git a/sphaira/source/ui/menus/homebrew.cpp b/sphaira/source/ui/menus/homebrew.cpp
index abce12a..2125f5e 100644
--- a/sphaira/source/ui/menus/homebrew.cpp
+++ b/sphaira/source/ui/menus/homebrew.cpp
@@ -153,7 +153,7 @@ Menu::Menu() : MenuBase{"Homebrew"_i18n} {
                 options->Add(std::make_shared<SidebarEntryCallback>("Install Forwarder"_i18n, [this](){
                     App::Push(std::make_shared<OptionBox>(
                         "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) {
                                 InstallHomebrew();
                             }