Ecosystem/gupaxx
1
0
Fork 0
mirror of https://github.com/Cyrix126/gupaxx.git synced 2024-12-22 22:59:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

main: fix on_close_event()

Browse source
This commit is contained in:
hinto.janai 2023-12-26 11:56:01 -05:00
parent 8fe06865e0
commit d9b4106970
No known key found for this signature in database
GPG key ID: D47CE05FA175A499
1 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/main.rs
View file

@ -1182,36 +1182,38 @@ fn main() {
} }
impl eframe::App for App { impl eframe::App for App {
#[inline(always)] #[inline]
fn on_close_event(&mut self) -> bool {
if self.state.gupax.ask_before_quit {
// If we're already on the [ask_before_quit] screen and
// the user tried to exit again, exit.
if self.error_state.quit_twice {
if self.state.gupax.save_before_quit { self.save_before_quit(); }
return true
}
// Else, set the error
self.error_state.set("", ErrorFerris::Oops, ErrorButtons::StayQuit);
self.error_state.quit_twice = true;
false
// Else, just quit.
} else {
if self.state.gupax.save_before_quit { self.save_before_quit(); }
true
}
}
#[inline(always)]
fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) { fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
// *-------* // *-------*
// | DEBUG | // | DEBUG |
// *-------* // *-------*
debug!("App | ----------- Start of [update()] -----------"); debug!("App | ----------- Start of [update()] -----------");
// If closing.
// Used to be `eframe::App::on_close_event(&mut self) -> bool`.
ctx.input(|input| {
if !input.viewport().close_requested() {
return;
}
if self.state.gupax.ask_before_quit {
// If we're already on the [ask_before_quit] screen and
// the user tried to exit again, exit.
if self.error_state.quit_twice {
if self.state.gupax.save_before_quit { self.save_before_quit(); }
ctx.send_viewport_cmd(egui::viewport::ViewportCommand::Close);
}
// Else, set the error
self.error_state.set("", ErrorFerris::Oops, ErrorButtons::StayQuit);
self.error_state.quit_twice = true;
// Else, just quit.
} else {
if self.state.gupax.save_before_quit { self.save_before_quit(); }
ctx.send_viewport_cmd(egui::viewport::ViewportCommand::Close);
}
});
// If [F11] was pressed, reverse [fullscreen] bool // If [F11] was pressed, reverse [fullscreen] bool
let mut input = ctx.input_mut(); let key: KeyPressed = ctx.input_mut(|input| {
let key: KeyPressed = {
if input.consume_key(Modifiers::NONE, Key::F11) { if input.consume_key(Modifiers::NONE, Key::F11) {
KeyPressed::F11 KeyPressed::F11
} else if input.consume_key(Modifiers::NONE, Key::Z) { } else if input.consume_key(Modifiers::NONE, Key::Z) {
@ -1237,8 +1239,8 @@ impl eframe::App for App {
} else { } else {
KeyPressed::None KeyPressed::None
} }
}; });
drop(input);
// Check if egui wants keyboard input. // Check if egui wants keyboard input.
// This prevents keyboard shortcuts from clobbering TextEdits. // This prevents keyboard shortcuts from clobbering TextEdits.
// (Typing S in text would always [Save] instead) // (Typing S in text would always [Save] instead)