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

Merge branch 'master' of https://github.com/emilk/egui into multiples_viewports

Browse Source
This commit is contained in:
Konkitoman
2023-09-25 23:15:51 +03:00
parent 8ecd29dea7 e8986b1e59
commit f4c5378ad3
25 changed files with 437 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -340,7 +340,7 @@ impl State {
.events
.push(egui::Event::CompositionEnd(text.clone()));
}
winit::event::Ime::Preedit(text, ..) => {
winit::event::Ime::Preedit(text, Some(_)) => {
if !self.input_method_editor_started {
self.input_method_editor_started = true;
self.egui_input.events.push(egui::Event::CompositionStart);
@@ -349,6 +349,7 @@ impl State {
.events
.push(egui::Event::CompositionUpdate(text.clone()));
}
winit::event::Ime::Preedit(_, None) => {}
};
EventResponse {