migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 13:20:05 -04:00
Code Activity

Fix focus problems on web (#4745)

Browse Source 
* Closes https://github.com/emilk/egui/issues/4743
* Related to https://github.com/emilk/egui/issues/4569
This commit is contained in:
Emil Ernerfeldt
2024-07-01 10:38:54 +02:00
committed by GitHub
parent 31716d787e
commit d271718065
3 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
crates/eframe/src/web/app_runner.rs
View File

@@ -181,13 +181,33 @@ impl AppRunner {
self.clipped_primitives.is_some()
}
/// Does the eframe app have focus?
///
/// Technically: does either the canvas or the [`TextAgent`] have focus?
pub fn has_focus(&self) -> bool {
super::has_focus(self.canvas()) || self.text_agent.has_focus()
}
pub fn update_focus(&mut self) {
let has_focus = self.has_focus();
if self.input.raw.focused != has_focus {
// log::debug!("{} Focus changed to {has_focus}", self.canvas().id());
self.input.set_focus(has_focus);
if !has_focus {
// We lost focus - good idea to save
self.save();
}
self.egui_ctx().request_repaint();
}
}
/// Runs the logic, but doesn't paint the result.
///
/// The result can be painted later with a call to [`Self::run_and_paint`] or [`Self::paint`].
pub fn logic(&mut self) {
// We sometimes miss blur/focus events due to the text agent, so let's just poll each frame:
self.input
.set_focus(super::has_focus(self.canvas()) || self.text_agent.has_focus());
self.update_focus();
let canvas_size = super::canvas_size_in_points(self.canvas(), self.egui_ctx());
let mut raw_input = self.input.new_frame(canvas_size);
@@ -253,8 +273,8 @@ impl AppRunner {
cursor_icon,
open_url,
copied_text,
events: _, // already handled
mutable_text_under_cursor,
events: _, // already handled
mutable_text_under_cursor: _, // TODO(#4569): https://github.com/emilk/egui/issues/4569
ime,
#[cfg(feature = "accesskit")]
accesskit_update: _, // not currently implemented
@@ -273,7 +293,17 @@ impl AppRunner {
#[cfg(not(web_sys_unstable_apis))]
let _ = copied_text;
self.text_agent.set_focus(mutable_text_under_cursor);
if self.has_focus() {
// The eframe app has focus.
if ime.is_some() {
// We are editing text: give the focus to the text agent.
self.text_agent.focus();
} else {
// We are not editing text - give the focus to the canvas.
self.text_agent.blur();
self.canvas().focus().ok();
}
}
if let Err(err) = self.text_agent.move_to(ime, self.canvas()) {
log::error!(