leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clear preedit if there is no pending preedit on Wayland

Browse source 
Fixes #2478.
This commit is contained in:
Weng Xuetian 2022-09-09 00:53:58 -07:00 • committed by GitHub
parent fec52b028e
commit 92ddb3483e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/platform_impl/linux/wayland/seat/text_input/handlers.rs
View file

@ -92,15 +92,21 @@ pub(super) fn handle_text_input(
event_sink.push_window_event(WindowEvent::Ime(Ime::Commit(text)), window_id);
}
// Push preedit string we've got after latest commit.
if let Some(preedit) = inner.pending_preedit.take() {
let cursor_range = preedit
.cursor_begin
.map(|b| (b, preedit.cursor_end.unwrap_or(b)));
// Always send preedit on `Done` events.
let (text, range) = inner
.pending_preedit
.take()
.map(|preedit| {
let cursor_range = preedit
.cursor_begin
.map(|b| (b, preedit.cursor_end.unwrap_or(b)));
let event = Ime::Preedit(preedit.text, cursor_range);
event_sink.push_window_event(WindowEvent::Ime(event), window_id);
}
(preedit.text, cursor_range)
})
.unwrap_or_default();
let event = Ime::Preedit(text, range);
event_sink.push_window_event(WindowEvent::Ime(event), window_id);
}
_ => (),
}