Fix macOS IME overlay positioning (#21416)

Conrad Irwin and Richard Feldman created 1 year ago

Release Notes:

- Improved positioning of macOS IME overlay

---------

Co-authored-by: Richard Feldman <[e-mail]>

Change summary

crates/editor/src/editor.rs            | 3 ++-
crates/gpui/src/platform/mac/window.rs | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)

Detailed changes

crates/editor/src/editor.rs

@@ -14611,7 +14611,8 @@ impl ViewInputHandler for Editor {
 
         let start = OffsetUtf16(range_utf16.start).to_display_point(&snapshot);
         let x = snapshot.x_for_display_point(start, &text_layout_details) - scroll_left
-            + self.gutter_dimensions.width;
+            + self.gutter_dimensions.width
+            + self.gutter_dimensions.margin;
         let y = line_height * (start.row().as_f32() - scroll_position.y);
 
         Some(Bounds {

crates/gpui/src/platform/mac/window.rs

@@ -1701,7 +1701,10 @@ extern "C" fn first_rect_for_character_range(
         let lock = state.lock();
         let mut frame = NSWindow::frame(lock.native_window);
         let content_layout_rect: CGRect = msg_send![lock.native_window, contentLayoutRect];
-        frame.origin.y -= frame.size.height - content_layout_rect.size.height;
+        let style_mask: NSWindowStyleMask = msg_send![lock.native_window, styleMask];
+        if !style_mask.contains(NSWindowStyleMask::NSFullSizeContentViewWindowMask) {
+            frame.origin.y -= frame.size.height - content_layout_rect.size.height;
+        }
         frame
     };
     with_input_handler(this, |input_handler| {