Leahnaya/cc3dsfs
1
0
Fork 0
mirror of https://github.com/Lorenzooone/cc3dsfs.git synced 2026-08-11 19:35:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify shutdown

Browse Source
This commit is contained in:
Lorenzooone
2024-06-02 22:55:44 +02:00
parent e7a2073246
commit 9de1e687ae
5 changed files with 45 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/WindowScreen_Menu.cpp
View File

@@ -110,6 +110,11 @@ void WindowScreen::destroy_menus() {
delete this->license_menu;
}
void WindowScreen::set_close(int ret_val) {
this->m_prepare_quit = true;
this->ret_val = ret_val;
}
void WindowScreen::split_change() {
if(this->curr_menu != CONNECT_MENU_TYPE)
this->curr_menu = DEFAULT_MENU_TYPE;
@@ -274,7 +279,7 @@ bool WindowScreen::common_poll(SFEvent &event_data) {
bool consumed = true;
switch(event_data.type) {
case sf::Event::Closed:
this->m_prepare_quit = true;
this->set_close(0);
break;
case sf::Event::TextEntered:
@@ -321,7 +326,7 @@ bool WindowScreen::common_poll(SFEvent &event_data) {
case sf::Event::KeyPressed:
switch(event_data.code) {
case sf::Keyboard::Escape:
this->m_prepare_quit = true;
this->set_close(0);
break;
case sf::Keyboard::Enter:
check_held_reset_key(true, this->enter_action);
@@ -802,7 +807,7 @@ void WindowScreen::poll() {
SFEvent event_data = events_queue.front();
events_queue.pop();
if((event_data.type == sf::Event::KeyPressed) && event_data.poweroff_cmd) {
this->m_prepare_quit = true;
this->set_close(1);
done = true;
continue;
}
@@ -844,7 +849,7 @@ void WindowScreen::poll() {
done = true;
break;
case MAIN_MENU_QUIT_APPLICATION:
this->m_prepare_quit = true;
this->set_close(0);
this->curr_menu = DEFAULT_MENU_TYPE;
done = true;
break;
@@ -885,6 +890,8 @@ void WindowScreen::poll() {
done = true;
break;
case MAIN_MENU_SHUTDOWN:
this->set_close(1);
this->curr_menu = DEFAULT_MENU_TYPE;
done = true;
break;
default:
@@ -1277,7 +1284,7 @@ void WindowScreen::poll() {
case EXTRA_SETTINGS_MENU_NO_ACTION:
break;
case EXTRA_SETTINGS_MENU_QUIT_APPLICATION:
this->m_prepare_quit = true;
this->set_close(0);
this->curr_menu = DEFAULT_MENU_TYPE;
done = true;
break;
@@ -1373,6 +1380,12 @@ bool WindowScreen::close_capture() {
return this->m_prepare_quit;
}
int WindowScreen::get_ret_val() {
if(!this->m_prepare_quit)
return -1;
return this->ret_val;
}
bool WindowScreen::query_reset_request() {
auto curr_time = std::chrono::high_resolution_clock::now();
if(check_held_diff(curr_time, this->right_click_action) > this->bad_resolution_timeout)