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

add option to restart sphaira upon installing an update

Browse Source
This commit is contained in:
ITotalJustice
2024-12-21 20:36:59 +00:00
parent e0040b625e
commit 483b2b3ce0
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sphaira/include/app.hpp
View File

@@ -42,6 +42,7 @@ public:
void Loop(); void Loop();
static void Exit(); static void Exit();
static void ExitRestart();
static auto GetVg() -> NVGcontext*; static auto GetVg() -> NVGcontext*;
static void Push(std::shared_ptr<ui::Widget>); static void Push(std::shared_ptr<ui::Widget>);
@@ -89,9 +90,6 @@ public:
void Update(); void Update();
void Poll(); void Poll();
void DrawBackground();
void DrawTouch();
// void DrawElement(float x, float y, float w, float h, ui::ThemeEntryID id); // void DrawElement(float x, float y, float w, float h, ui::ThemeEntryID id);
auto LoadElementImage(std::string_view value) -> ElementEntry; auto LoadElementImage(std::string_view value) -> ElementEntry;
auto LoadElementColour(std::string_view value) -> ElementEntry; auto LoadElementColour(std::string_view value) -> ElementEntry;

5
sphaira/source/app.cpp
View File

@@ -505,6 +505,11 @@ void App::Exit() {
g_app->m_quit = true; g_app->m_quit = true;
} }
void App::ExitRestart() {
nro_launch(GetExePath());
Exit();
}
void App::Poll() { void App::Poll() {
m_controller.Reset(); m_controller.Reset();

10
sphaira/source/ui/menus/main_menu.cpp
View File

@@ -205,7 +205,6 @@ MainMenu::MainMenu() {
auto options = std::make_shared<Sidebar>("Menu Options"_i18n, "v" APP_VERSION_HASH, Sidebar::Side::LEFT); auto options = std::make_shared<Sidebar>("Menu Options"_i18n, "v" APP_VERSION_HASH, Sidebar::Side::LEFT);
ON_SCOPE_EXIT(App::Push(options)); ON_SCOPE_EXIT(App::Push(options));
SidebarEntryArray::Items language_items; SidebarEntryArray::Items language_items;
language_items.push_back("Auto"_i18n); language_items.push_back("Auto"_i18n);
language_items.push_back("English"_i18n); language_items.push_back("English"_i18n);
@@ -261,6 +260,15 @@ MainMenu::MainMenu() {
}, [this](bool success){ }, [this](bool success){
if (success) { if (success) {
m_update_state = UpdateState::None; m_update_state = UpdateState::None;
App::Notify("Updated to "_i18n + m_update_version);
App::Push(std::make_shared<OptionBox>(
"Restart Sphaira?"_i18n,
"Back"_i18n, "Restart"_i18n, 1, [this](auto op_index){
if (op_index && *op_index) {
App::ExitRestart();
}
}
));
} else { } else {
App::Push(std::make_shared<ui::ErrorBox>(MAKERESULT(351, 1), "Failed to download update"_i18n)); App::Push(std::make_shared<ui::ErrorBox>(MAKERESULT(351, 1), "Failed to download update"_i18n));
} }