alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2025-01-11 05:21:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

On macOS, fix backspace emission on preedit clear

Browse source 
Fixes: d15feb5cfa (On macOS, fix empty marked text)
This commit is contained in:
Kirill Chibisov 2023-05-13 03:02:05 +03:00 committed by GitHub
parent bd9cc2a9da
commit a9e168e10d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -21,6 +21,7 @@ And please only add new entries to the top of this list, right below the `# Unre
- On Wayland, add `Window::drag_resize_window` method. - On Wayland, add `Window::drag_resize_window` method.
- On Wayland, drop `WINIT_WAYLAND_CSD_THEME` variable. - On Wayland, drop `WINIT_WAYLAND_CSD_THEME` variable.
- Bump MSRV from `1.60` to `1.64`. - Bump MSRV from `1.60` to `1.64`.
- On macOS, fix `Backspace` being emitted when clearing preedit with it.
# 0.28.5 # 0.28.5

6
src/platform_impl/macos/view.rs
View file

@ -50,7 +50,7 @@ impl Default for CursorState {
} }
} }
#[derive(Debug, Eq, PartialEq)] #[derive(Debug, Eq, PartialEq, Clone, Copy)]
enum ImeState { enum ImeState {
/// The IME events are disabled, so only `ReceivedCharacter` is being sent to the user. /// The IME events are disabled, so only `ReceivedCharacter` is being sent to the user.
Disabled, Disabled,
@ -481,6 +481,7 @@ declare_class!(
&& !ev_mods.logo(); && !ev_mods.logo();
let characters = get_characters(event, ignore_alt_characters); let characters = get_characters(event, ignore_alt_characters);
let old_ime_state = self.state.ime_state;
self.state.forward_key_to_app = false; self.state.forward_key_to_app = false;
// The `interpretKeyEvents` function might call // The `interpretKeyEvents` function might call
@ -518,7 +519,8 @@ declare_class!(
true true
} }
ImeState::Preedit => true, ImeState::Preedit => true,
_ => false, // `key_down` could result in preedit clear, so compare old and current state.
_ => old_ime_state != self.state.ime_state,
}; };
if !had_ime_input || self.state.forward_key_to_app { if !had_ime_input || self.state.forward_key_to_app {