skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eframe: Correctly identify if browser tab has focus (#4280) 

`input.focus` was often wrong on web
This commit is contained in:
Emil Ernerfeldt 2024-03-30 16:22:16 +01:00 committed by GitHub
parent 7277322983
commit d3c6895443
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/eframe/src/web/backend.rs
View File

@ -36,8 +36,10 @@ impl WebInput {
raw_input raw_input
} }
/// On alt-tab and similar.
pub fn on_web_page_focus_change(&mut self, focused: bool) { pub fn on_web_page_focus_change(&mut self, focused: bool) {
self.raw.modifiers = egui::Modifiers::default(); // log::debug!("on_web_page_focus_change: {focused}");
self.raw.modifiers = egui::Modifiers::default(); // Avoid sticky modifier keys on alt-tab:
self.raw.focused = focused; self.raw.focused = focused;
self.raw.events.push(egui::Event::WindowFocused(focused)); self.raw.events.push(egui::Event::WindowFocused(focused));
self.latest_touch_pos = None; self.latest_touch_pos = None;

47
crates/eframe/src/web/events.rs
View File

@ -50,24 +50,21 @@ fn paint_if_needed(runner: &mut AppRunner) {
pub(crate) fn install_document_events(runner_ref: &WebRunner) -> Result<(), JsValue> { pub(crate) fn install_document_events(runner_ref: &WebRunner) -> Result<(), JsValue> {
let document = web_sys::window().unwrap().document().unwrap(); let document = web_sys::window().unwrap().document().unwrap();
{ for event_name in ["blur", "focus"] {
// Avoid sticky modifier keys on alt-tab: let closure = move |_event: web_sys::MouseEvent, runner: &mut AppRunner| {
for event_name in ["blur", "focus"] { // log::debug!("{event_name:?}");
let closure = move |_event: web_sys::MouseEvent, runner: &mut AppRunner| { let has_focus = event_name == "focus";
let has_focus = event_name == "focus";
if !has_focus { if !has_focus {
// We lost focus - good idea to save // We lost focus - good idea to save
runner.save(); runner.save();
} }
runner.input.on_web_page_focus_change(has_focus); runner.input.on_web_page_focus_change(has_focus);
runner.egui_ctx().request_repaint(); runner.egui_ctx().request_repaint();
// log::debug!("{event_name:?}"); };
};
runner_ref.add_event_listener(&document, event_name, closure)?; runner_ref.add_event_listener(&document, event_name, closure)?;
}
} }
runner_ref.add_event_listener( runner_ref.add_event_listener(
@ -228,13 +225,31 @@ pub(crate) fn install_document_events(runner_ref: &WebRunner) -> Result<(), JsVa
pub(crate) fn install_window_events(runner_ref: &WebRunner) -> Result<(), JsValue> { pub(crate) fn install_window_events(runner_ref: &WebRunner) -> Result<(), JsValue> {
let window = web_sys::window().unwrap(); let window = web_sys::window().unwrap();
for event_name in ["blur", "focus"] {
let closure = move |_event: web_sys::MouseEvent, runner: &mut AppRunner| {
// log::debug!("{event_name:?}");
let has_focus = event_name == "focus";
if !has_focus {
// We lost focus - good idea to save
runner.save();
}
runner.input.on_web_page_focus_change(has_focus);
runner.egui_ctx().request_repaint();
};
runner_ref.add_event_listener(&window, event_name, closure)?;
}
// Save-on-close // Save-on-close
runner_ref.add_event_listener(&window, "onbeforeunload", |_: web_sys::Event, runner| { runner_ref.add_event_listener(&window, "onbeforeunload", |_: web_sys::Event, runner| {
runner.save(); runner.save();
})?; })?;
for event_name in &["load", "pagehide", "pageshow", "resize"] { for event_name in &["load", "pagehide", "pageshow", "resize"] {
runner_ref.add_event_listener(&window, event_name, |_: web_sys::Event, runner| { runner_ref.add_event_listener(&window, event_name, move |_: web_sys::Event, runner| {
// log::debug!("{event_name:?}");
runner.needs_repaint.repaint_asap(); runner.needs_repaint.repaint_asap();
})?; })?;
} }