From be40f919595cb5071a7da935365e72c8c5dfe14c Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Mon, 17 Apr 2023 12:28:49 +0200
Subject: [PATCH] Minor tweaks

---
 native/Avalonia.Native/src/OSX/AvnView.mm | 34 +++++++++++++----------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/AvnView.mm b/native/Avalonia.Native/src/OSX/AvnView.mm
index 1c950f01a8..f29508c851 100644
--- a/native/Avalonia.Native/src/OSX/AvnView.mm
+++ b/native/Avalonia.Native/src/OSX/AvnView.mm
@@ -22,7 +22,7 @@
     AvnPlatformResizeReason _resizeReason;
     AvnAccessibilityElement* _accessibilityChild;
     NSRect _cursorRect;
-    NSMutableString* _text;
+    NSMutableAttributedString* _text;
     NSRange _selection;
 }
 
@@ -59,6 +59,11 @@
     [self registerForDraggedTypes: @[@"public.data", GetAvnCustomDataType()]];
 
     _modifierState = AvnInputModifiersNone;
+    
+    _text = [[NSMutableAttributedString alloc] initWithString:@""];
+    _markedText = [[NSMutableAttributedString alloc] initWithString:@""];
+    _selection = NSMakeRange(NSNotFound, 0);
+    
     return self;
 }
 
@@ -530,10 +535,6 @@
     }
 }
 
-- (void) doCommandBySelector:(SEL)selector{
-    
-}
-
 - (void)keyUp:(NSEvent *)event
 {
     [self keyboardEvent:event withType:KeyUp];
@@ -575,7 +576,7 @@
 - (NSRange)markedRange
 {
     if([_markedText length] > 0)
-        return NSMakeRange(0, [_markedText length] - 1);
+        return NSMakeRange(_selection.location, [_markedText length]);
     return NSMakeRange(NSNotFound, 0);
 }
 
@@ -608,8 +609,11 @@
 {
     [[_markedText mutableString] setString:@""];
     
-    [[self inputContext] discardMarkedText];
-    
+    if([self inputContext]) {
+        [[self inputContext] discardMarkedText];
+        [[self inputContext] invalidateCharacterCoordinates];
+    }
+
     if(!_parent->InputMethod->IsActive()){
         return;
     }
@@ -631,8 +635,6 @@
 {
     _lastKeyHandled = true;
     
-    [self unmarkText];
-
     if(_parent != nullptr)
     {
         uint32_t timestamp = static_cast<uint32_t>([NSDate timeIntervalSinceReferenceDate] * 1000);
@@ -640,7 +642,7 @@
         _lastKeyHandled = _parent->BaseEvents->RawTextInputEvent(timestamp, [string UTF8String]);
     }
     
-    [[self inputContext] invalidateCharacterCoordinates];
+    //[self unmarkText];
 }
 
 - (NSUInteger)characterIndexForPoint:(NSPoint)point
@@ -762,13 +764,15 @@
 - (void) setText:(NSString *)text{
     [self unmarkText];
     
-    [_text setString:text];
+    [[_text mutableString] setString:text];
 }
 
 - (void) setSelection:(int)start :(int)end{
     _selection = NSMakeRange(start, end - start);
     
-    [[self inputContext] invalidateCharacterCoordinates];
+    if([self inputContext]) {
+        [[self inputContext] invalidateCharacterCoordinates];
+    }
 }
 
 - (void) setCursorRect:(AvnRect)rect{
@@ -780,7 +784,9 @@
     
     _cursorRect = windowRectOnScreen;
     
-    [[self inputContext] invalidateCharacterCoordinates];
+    if([self inputContext]) {
+        [[self inputContext] invalidateCharacterCoordinates];
+    }
 }
 
 @end