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

macOS set_ime_position fixes (#2180)

Browse source 
* Use NSView's inputContext instead of creating our own

This means that `set_ime_position` now properly invalidates the character coordinates.

* Make `set_ime_position` robust against moving windows
This commit is contained in:
Mads Marquart 2022-03-18 14:50:24 +01:00 • committed by GitHub
parent a438091266
commit e22c76b3ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/platform_impl/macos/window.rs
View file

@ -363,7 +363,6 @@ impl Drop for SharedStateMutexGuard<'_> {
pub struct UnownedWindow {
pub ns_window: IdRef, // never changes
pub ns_view: IdRef, // never changes
input_context: IdRef, // never changes
shared_state: Arc<Mutex<SharedState>>,
decorations: AtomicBool,
cursor_state: Weak<Mutex<CursorState>>,
@ -398,8 +397,6 @@ impl UnownedWindow {
ns_window.setInitialFirstResponder_(*ns_view);
}
let input_context = unsafe { util::create_input_context(*ns_view) };
let scale_factor = unsafe { NSWindow::backingScaleFactor(*ns_window) as f64 };
unsafe {
@ -442,7 +439,6 @@ impl UnownedWindow {
let window = Arc::new(UnownedWindow {
ns_view,
ns_window,
input_context,
shared_state: Arc::new(Mutex::new(win_attribs.into())),
decorations: AtomicBool::new(decorations),
cursor_state,
@ -1046,14 +1042,7 @@ impl UnownedWindow {
pub fn set_ime_position(&self, spot: Position) {
let scale_factor = self.scale_factor();
let logical_spot = spot.to_logical(scale_factor);
unsafe {
view::set_ime_position(
*self.ns_view,
*self.input_context,
logical_spot.x,
logical_spot.y,
);
}
unsafe { view::set_ime_position(*self.ns_view, logical_spot) };
}
#[inline]