Skip to content

Commit

Permalink
Only show on-screen-keyboard and IME when editing text (#3362)
Browse files Browse the repository at this point in the history
* Remove calls to `set_ime_allowed`

* Allow IME if `text_cursor_pos` is `Some`

* Only call `Window::set_ime_allowed` when necessary

* allow_ime doesn't need to be atomic

* Remove unused imports

* Fix assignment
  • Loading branch information
Barugon authored Sep 19, 2023
1 parent 08c46ac commit c07394b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
3 changes: 0 additions & 3 deletions crates/eframe/src/native/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,6 @@ mod glow_integration {
let theme = system_theme.unwrap_or(self.native_options.default_theme);
integration.egui_ctx.set_visuals(theme.egui_visuals());

gl_window.window().set_ime_allowed(true);
if self.native_options.mouse_passthrough {
gl_window.window().set_cursor_hittest(false).unwrap();
}
Expand Down Expand Up @@ -1269,8 +1268,6 @@ mod wgpu_integration {
let theme = system_theme.unwrap_or(self.native_options.default_theme);
integration.egui_ctx.set_visuals(theme.egui_visuals());

window.set_ime_allowed(true);

{
let event_loop_proxy = self.repaint_proxy.clone();
integration
Expand Down
10 changes: 10 additions & 0 deletions crates/egui-winit/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ pub struct State {

#[cfg(feature = "accesskit")]
accesskit: Option<accesskit_winit::Adapter>,

allow_ime: bool,
}

impl State {
Expand Down Expand Up @@ -107,6 +109,8 @@ impl State {

#[cfg(feature = "accesskit")]
accesskit: None,

allow_ime: false,
}
}

Expand Down Expand Up @@ -663,6 +667,12 @@ impl State {
self.clipboard.set(copied_text);
}

let allow_ime = text_cursor_pos.is_some();
if self.allow_ime != allow_ime {
self.allow_ime = allow_ime;
window.set_ime_allowed(allow_ime);
}

if let Some(egui::Pos2 { x, y }) = text_cursor_pos {
window.set_ime_position(winit::dpi::LogicalPosition { x, y });
}
Expand Down

0 comments on commit c07394b

Please sign in to comment.