Ecosystem/gupaxx
1
0
Fork 0
mirror of https://github.com/Cyrix126/gupaxx.git synced 2024-11-16 23:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

main: fix closing

Browse source
This commit is contained in:
hinto.janai 2023-12-28 09:22:45 -05:00
parent 62865f7c41
commit a51234d353
No known key found for this signature in database
GPG key ID: D47CE05FA175A499
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main.rs
View file

@ -1191,26 +1191,35 @@ impl eframe::App for App {
// If closing. // If closing.
// Used to be `eframe::App::on_close_event(&mut self) -> bool`. // Used to be `eframe::App::on_close_event(&mut self) -> bool`.
ctx.input(|input| { let close_signal = ctx.input(|input| {
use egui::viewport::ViewportCommand;
if !input.viewport().close_requested() { if !input.viewport().close_requested() {
return; return None;
} }
if self.state.gupax.ask_before_quit { if self.state.gupax.ask_before_quit {
// If we're already on the [ask_before_quit] screen and // If we're already on the [ask_before_quit] screen and
// the user tried to exit again, exit. // the user tried to exit again, exit.
if self.error_state.quit_twice { if self.error_state.quit_twice {
if self.state.gupax.save_before_quit { self.save_before_quit(); } if self.state.gupax.save_before_quit { self.save_before_quit(); }
ctx.send_viewport_cmd(egui::viewport::ViewportCommand::Close); return Some(ViewportCommand::Close);
} }
// Else, set the error // Else, set the error
self.error_state.set("", ErrorFerris::Oops, ErrorButtons::StayQuit); self.error_state.set("", ErrorFerris::Oops, ErrorButtons::StayQuit);
self.error_state.quit_twice = true; self.error_state.quit_twice = true;
Some(ViewportCommand::CancelClose)
// Else, just quit. // Else, just quit.
} else { } else {
if self.state.gupax.save_before_quit { self.save_before_quit(); } if self.state.gupax.save_before_quit { self.save_before_quit(); }
ctx.send_viewport_cmd(egui::viewport::ViewportCommand::Close); Some(ViewportCommand::Close)
} }
}); });
// This will either:
// 1. Cancel a close signal
// 2. Close the program
if let Some(cmd) = close_signal {
ctx.send_viewport_cmd(cmd);
}
// If [F11] was pressed, reverse [fullscreen] bool // If [F11] was pressed, reverse [fullscreen] bool
let key: KeyPressed = ctx.input_mut(|input| { let key: KeyPressed = ctx.input_mut(|input| {