Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e2df8dc
Fix: attempt to make `TextAgent` more robust on some edge cases
umajho Mar 29, 2026
b0b6614
Fix(eframe/web): try also working around #8046
umajho Mar 30, 2026
5d2800a
Refactor(eframe/web): simplify
umajho Mar 30, 2026
da27319
Fix(eframe/web): Chromium not covered by GBoard workaround
umajho Mar 30, 2026
69195bd
Fix(eframe/web): try fixing GBoard Chinese Pinyin IME issue
umajho Mar 30, 2026
ce148c5
Fix: try fixing
umajho Apr 1, 2026
e223248
Refactor(egui): improve naming, add docs, and add test cases
umajho Apr 1, 2026
4509c87
Merge branch 'main' into fix-cheonjiin
umajho Apr 5, 2026
f139c60
Fix(eframe/web): try fixing problem with Samsung Keyboard Korean auto…
umajho Apr 5, 2026
65c146a
Merge branch 'main' into fix-cheonjiin
umajho Apr 6, 2026
5ce55ad
Fix(eframe/web): text agent state not cleared on blur
umajho Apr 6, 2026
a8fe407
Merge branch 'main' into fix-cheonjiin
umajho Apr 8, 2026
c11ff42
Merge branch 'main' into fix-cheonjiin
umajho Apr 15, 2026
7a2d9df
Refactor: minor changes
umajho Apr 8, 2026
3a90774
Refactor(eframe/web): remove an obscure workaround that also not seem…
umajho Apr 8, 2026
948531e
Refactor(eframe/web): move event handling within `impl InputState`
umajho Apr 15, 2026
e16658c
Feat: introduce custom debug informations in `debug_assertions` to he…
umajho Apr 15, 2026
33695e3
fixup
umajho Apr 15, 2026
886ad4c
fix my English
umajho Apr 15, 2026
76d4e36
Merge branch 'main' into fix-cheonjiin
umajho May 26, 2026
33d9894
Merge branch 'main' into fix-cheonjiin
umajho Jun 10, 2026
d8a6813
Merge branch 'one-commit-before-pr-8083-merged' into fix-cheonjiin
umajho Jun 26, 2026
15fd72a
Merge branch 'pr-8083-merged' into fix-cheonjiin
umajho Jun 26, 2026
1d25664
Merge branch 'main' into fix-cheonjiin
umajho Jun 26, 2026
909050b
Style(eframe/web): make CI checks happy
umajho Jun 26, 2026
5c34b39
Fix: fix bugs surfaced after #8083 merged found by rustbasic
umajho Jul 1, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion crates/eframe/src/web/app_runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,10 @@ impl AppRunner {

if self.has_focus() {
// The eframe app has focus.
if ime.is_some() {
if let Some(ime) = ime {
if ime.should_interrupt_composition {
self.text_agent.interrupt_ime_composition();
}
// We are editing text: give the focus to the text agent.
self.text_agent.focus();
} else {
Expand All @@ -415,6 +418,12 @@ impl AppRunner {
);
}
}

#[cfg(debug_assertions)]
pub(crate) fn update_custom_debug_information(&mut self) {
self.text_agent
.update_custom_debug_information(&mut self.input);
}
}

// ----------------------------------------------------------------------------
Expand Down
10 changes: 5 additions & 5 deletions crates/eframe/src/web/events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ pub(crate) fn paint_and_schedule(runner_ref: &WebRunner) -> Result<(), JsValue>

fn paint_if_needed(runner: &mut AppRunner) {
if runner.needs_repaint.needs_repaint() {
#[cfg(debug_assertions)]
if !runner.input.raw.events.is_empty() {
runner.update_custom_debug_information();
}

if runner.has_outstanding_paint_data() {
// We have already run the logic, e.g. in an on-click event,
// so let's only present the results:
Expand Down Expand Up @@ -190,11 +195,6 @@ pub(crate) fn on_keydown(event: web_sys::KeyboardEvent, runner: &mut AppRunner)
return;
}

if event.is_composing() || event.key_code() == 229 {
// https://web.archive.org/web/20200526195704/https://www.fxsitecompat.dev/en-CA/docs/2018/keydown-and-keyup-events-are-now-fired-during-ime-composition/
return;
}

let modifiers = modifiers_from_kb_event(&event);
runner.input.raw.modifiers = modifiers;

Expand Down
Loading
Loading