migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 06:40:06 -04:00
Code Activity

Refactor: move Windows Korean IME workaround from egui to egui-winit

Browse Source 
The bug is specific to `egui-winit` and is unlikely present in other
implementations. Applying the workaround in `egui` degrades implementations
that already behave correctly.
This commit is contained in:
umajho
2026-06-11 17:38:39 +08:00
parent 1d699a1ad5
commit fbd1ccd6a9
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/egui-winit/src/lib.rs
View File

@@ -706,7 +706,20 @@ impl State {
text.get(..start_bytes).map(|s| s.chars().count()), text.get(..start_bytes).map(|s| s.chars().count()),
text.get(start_bytes..end_bytes).map(|s| s.chars().count()), text.get(start_bytes..end_bytes).map(|s| s.chars().count()),
) { ) {
Some(start_chars..start_chars + middle_chars) if cfg!(target_os = "windows") && start_chars == 0 && middle_chars == 0
{
// Workaround for a bug on Windows where `winit`
// incorrectly reports the cursor position at
// the start of the preedit text during
// composition with the builtin Korean IME.
// See: https://github.com/emilk/egui/pull/8083#issuecomment-4206742668
// TODO(umajho): Remove this workaround once the
// `winit` bug is fixed and we've updated to a
// version that includes the fix.
None
} else {
Some(start_chars..start_chars + middle_chars)
}
} else { } else {
log::warn!("ignoring {ime:?}'s range because it is invalid"); log::warn!("ignoring {ime:?}'s range because it is invalid");
None None

14
crates/egui/src/text_selection/visuals.rs
View File

@@ -161,20 +161,6 @@ pub(crate) fn paint_ime_preedit_text_visuals(
relative_active_range.end.index = preedit_range.end.index - preedit_range.start.index; relative_active_range.end.index = preedit_range.end.index - preedit_range.start.index;
} }
if matches!(ui.ctx().os(), crate::os::OperatingSystem::Windows)
&& let Some(r) = &relative_active_range
&& r.start.index == 0
&& r.end.index == 0
{
// Workaround for a bug on Windows where `winit` incorrectly reports
// the cursor position at the start of the preedit text during
// composition with the builtin Korean IME.
// See: https://github.com/emilk/egui/pull/8083#issuecomment-4206742668
// TODO(umajho): Remove this workaround once the `winit` bug is fixed
// and we've updated to a version that includes the fix.
relative_active_range = None;
}
let visuals = ui.visuals(); let visuals = ui.visuals();
let active_underline_stroke = visuals.ime_composition.active_underline_stroke; let active_underline_stroke = visuals.ime_composition.active_underline_stroke;
let inactive_underline_stroke = visuals.ime_composition.inactive_underline_stroke; let inactive_underline_stroke = visuals.ime_composition.inactive_underline_stroke;