From 756d23d7e85922d117977bc3a177b6261c74f766 Mon Sep 17 00:00:00 2001 From: hatoo Date: Tue, 31 Dec 2019 18:02:35 +0900 Subject: [PATCH 1/3] MacOS FIX #1267 --- src/platform_impl/macos/view.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/platform_impl/macos/view.rs b/src/platform_impl/macos/view.rs index 8795ea1815..693057adf7 100644 --- a/src/platform_impl/macos/view.rs +++ b/src/platform_impl/macos/view.rs @@ -376,13 +376,10 @@ extern "C" fn reset_cursor_rects(this: &Object, _sel: Sel) { } } -extern "C" fn has_marked_text(this: &Object, _sel: Sel) -> BOOL { - unsafe { - trace!("Triggered `hasMarkedText`"); - let marked_text: id = *this.get_ivar("markedText"); - trace!("Completed `hasMarkedText`"); - (marked_text.length() > 0) as i8 - } +extern "C" fn has_marked_text(_this: &Object, _sel: Sel) -> BOOL { + trace!("Triggered `hasMarkedText`"); + trace!("Completed `hasMarkedText`"); + YES } extern "C" fn marked_range(this: &Object, _sel: Sel) -> NSRange { From e856d2a744908d31a9a87a73bf48bccb55d52016 Mon Sep 17 00:00:00 2001 From: hatoo Date: Sun, 5 Jan 2020 14:20:13 -0500 Subject: [PATCH 2/3] Add CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55033c9c89..86317c35c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Unreleased - On X11, fix `ModifiersChanged` emitting incorrect modifier change events +- On macOS, fix not sending ReceivedCharacter event for specific keys combinations. # 0.20.0 Alpha 6 (2020-01-03) From da3cfcff4062786dc6c9b24e42b47081845c2d28 Mon Sep 17 00:00:00 2001 From: hatoo Date: Sat, 4 Jan 2020 19:33:09 +0900 Subject: [PATCH 3/3] Remove unnecessary trace! --- src/platform_impl/macos/view.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/platform_impl/macos/view.rs b/src/platform_impl/macos/view.rs index 693057adf7..9bd929da80 100644 --- a/src/platform_impl/macos/view.rs +++ b/src/platform_impl/macos/view.rs @@ -377,8 +377,6 @@ extern "C" fn reset_cursor_rects(this: &Object, _sel: Sel) { } extern "C" fn has_marked_text(_this: &Object, _sel: Sel) -> BOOL { - trace!("Triggered `hasMarkedText`"); - trace!("Completed `hasMarkedText`"); YES }