Skip to content

Android ime support #3196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lucasmerlin wants to merge 4 commits into from
Closed

Android ime support #3196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8835e9e
Update winit to 0.29.0-beta.0
lucasmerlin Aug 1, 2023
d47677a
Implement android ime support
lucasmerlin Jul 5, 2023
9e73f11
Keep the focused text field in view when the window resizes
lucasmerlin Jul 31, 2023
c35853a
Update android ime implementation
lucasmerlin Aug 1, 2023
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
313 changes: 270 additions & 43 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ opt-level = 2

[workspace.dependencies]
thiserror = "1.0.37"

[patch.crates-io]
winit = { path = "../github/winit"}
2 changes: 1 addition & 1 deletion crates/eframe/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ image = { version = "0.24", default-features = false, features = [
"png",
] } # Needed for app icon
raw-window-handle = { version = "0.5.0" }
winit = "0.28.1"
winit = "0.29.0-beta.0"

# optional native:
directories-next = { version = "2", optional = true }
Expand Down
3 changes: 0 additions & 3 deletions crates/eframe/src/native/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,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 @@ -1193,8 +1192,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
3 changes: 2 additions & 1 deletion crates/eframe/src/web/app_runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@ impl AppRunner {
mutable_text_under_cursor,
text_cursor_pos,
#[cfg(feature = "accesskit")]
accesskit_update: _, // not currently implemented
accesskit_update: _, // not currently implemented
text_input_state: _, // not currently implemented
} = platform_output;

super::set_cursor_icon(cursor_icon);
Expand Down
2 changes: 1 addition & 1 deletion crates/egui-wgpu/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ wgpu = "0.16.0"
## Enable this when generating docs.
document-features = { version = "0.2", optional = true }

winit = { version = "0.28", optional = true }
winit = { version = "0.29.0-beta.0", optional = true }

# Native:
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
Expand Down
3 changes: 2 additions & 1 deletion crates/egui-winit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ egui = { version = "0.22.0", path = "../egui", default-features = false, feature
"log",
] }
log = { version = "0.4", features = ["std"] }
winit = { version = "0.28", default-features = false }
winit = { version = "0.29.0-beta.0", default-features = false }
smol_str = "0.2.0"
raw-window-handle = "0.5.0"

#! ### Optional dependencies
Expand Down
Loading