1
1
mirror of https://github.com/wez/wezterm.git synced 2024-12-23 13:21:38 +03:00

Fix IME candidate window position on macOS

This commit is contained in:
kumattau 2022-05-24 05:58:18 +09:00 committed by Wez Furlong
parent 504841f0ae
commit 89d78ac410

View File

@ -1714,10 +1714,9 @@ impl WindowView {
range,
actual
);
let frame = unsafe {
let window: id = msg_send![this, window];
NSWindow::frame(window)
};
let window: id = unsafe { msg_send![this, window] };
let frame = unsafe { NSWindow::frame(window) };
let content: NSRect = unsafe { msg_send![window, contentRectForFrameRect: frame] };
let backing_frame: NSRect = unsafe { msg_send![this, convertRectToBacking: frame] };
let scale = frame.size.width / backing_frame.size.width;
@ -1731,11 +1730,8 @@ impl WindowView {
NSRect::new(
NSPoint::new(
frame.origin.x + cursor_pos.origin.x,
// Position below the text so that drop-downs
// don't obscure the text in the terminal
frame.origin.y + frame.size.height
- (cursor_pos.max_y() + cursor_pos.size.height * 2.5),
content.origin.x + cursor_pos.min_x(),
content.origin.y + content.size.height - cursor_pos.max_y(),
),
NSSize::new(cursor_pos.size.width, cursor_pos.size.height),
)