parent
2b2e70cb91
commit
a9efbcff36
|
|
@ -342,20 +342,12 @@ impl State {
|
||||||
// We use input_method_editor_started to manually insert CompositionStart
|
// We use input_method_editor_started to manually insert CompositionStart
|
||||||
// between Commits.
|
// between Commits.
|
||||||
match ime {
|
match ime {
|
||||||
winit::event::Ime::Enabled => {
|
winit::event::Ime::Enabled => {}
|
||||||
self.egui_input
|
winit::event::Ime::Preedit(_, None) => {
|
||||||
.events
|
self.ime_event_enable();
|
||||||
.push(egui::Event::Ime(egui::ImeEvent::Enabled));
|
|
||||||
self.has_sent_ime_enabled = true;
|
|
||||||
}
|
}
|
||||||
winit::event::Ime::Preedit(_, None) => {}
|
|
||||||
winit::event::Ime::Preedit(text, Some(_cursor)) => {
|
winit::event::Ime::Preedit(text, Some(_cursor)) => {
|
||||||
if !self.has_sent_ime_enabled {
|
self.ime_event_enable();
|
||||||
self.egui_input
|
|
||||||
.events
|
|
||||||
.push(egui::Event::Ime(egui::ImeEvent::Enabled));
|
|
||||||
self.has_sent_ime_enabled = true;
|
|
||||||
}
|
|
||||||
self.egui_input
|
self.egui_input
|
||||||
.events
|
.events
|
||||||
.push(egui::Event::Ime(egui::ImeEvent::Preedit(text.clone())));
|
.push(egui::Event::Ime(egui::ImeEvent::Preedit(text.clone())));
|
||||||
|
|
@ -364,16 +356,10 @@ impl State {
|
||||||
self.egui_input
|
self.egui_input
|
||||||
.events
|
.events
|
||||||
.push(egui::Event::Ime(egui::ImeEvent::Commit(text.clone())));
|
.push(egui::Event::Ime(egui::ImeEvent::Commit(text.clone())));
|
||||||
self.egui_input
|
self.ime_event_disable();
|
||||||
.events
|
|
||||||
.push(egui::Event::Ime(egui::ImeEvent::Disabled));
|
|
||||||
self.has_sent_ime_enabled = false;
|
|
||||||
}
|
}
|
||||||
winit::event::Ime::Disabled => {
|
winit::event::Ime::Disabled => {
|
||||||
self.egui_input
|
self.ime_event_disable();
|
||||||
.events
|
|
||||||
.push(egui::Event::Ime(egui::ImeEvent::Disabled));
|
|
||||||
self.has_sent_ime_enabled = false;
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -492,6 +478,22 @@ impl State {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn ime_event_enable(&mut self) {
|
||||||
|
if !self.has_sent_ime_enabled {
|
||||||
|
self.egui_input
|
||||||
|
.events
|
||||||
|
.push(egui::Event::Ime(egui::ImeEvent::Enabled));
|
||||||
|
self.has_sent_ime_enabled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn ime_event_disable(&mut self) {
|
||||||
|
self.egui_input
|
||||||
|
.events
|
||||||
|
.push(egui::Event::Ime(egui::ImeEvent::Disabled));
|
||||||
|
self.has_sent_ime_enabled = false;
|
||||||
|
}
|
||||||
|
|
||||||
pub fn on_mouse_motion(&mut self, delta: (f64, f64)) {
|
pub fn on_mouse_motion(&mut self, delta: (f64, f64)) {
|
||||||
self.egui_input.events.push(egui::Event::MouseMoved(Vec2 {
|
self.egui_input.events.push(egui::Event::MouseMoved(Vec2 {
|
||||||
x: delta.0 as f32,
|
x: delta.0 as f32,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue