Fix drawing background on Sonoma

praeclarum · Oct 12, 2023 · b676146 · b676146
1 parent e44f230
commit b676146
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Editor/Mac/CEditor.cs b/Editor/Mac/CEditor.cs
@@ -4,11 +4,13 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 
 using Foundation;
 using CoreGraphics;
+using ObjCRuntime;
 
 #if __IOS__
 using UIKit;
@@ -49,10 +51,10 @@ public class CEditor : NativeView, INSTextStorageDelegate, INativeTextViewDelega
         NSLayoutConstraint? marginWidthConstraint;
 
         public string Text {
-            get => textView.TextStorage.Value;
+            get => textView.TextStorage.Value ?? "";
             set {
                 var val = value ?? "";
-                var oldText = textView.TextStorage.Value;
+                var oldText = textView.TextStorage.Value ?? "";
                 if (oldText == val)
                     return;
                 textView.TextStorage.SetString (new NSAttributedString (value ?? "", theme.CommentAttributes));
@@ -530,7 +532,7 @@ void ColorizeCode (NSTextStorage textStorage)
         {
             try {
 
-                var code = textStorage.Value;
+                var code = textStorage.Value ?? "";
                 var managers = textStorage.LayoutManagers;
 
                 //

diff --git a/Editor/Mac/ErrorView.cs b/Editor/Mac/ErrorView.cs
@@ -69,7 +69,9 @@ public string MessageText {
         protected override void DrawDirtyRect (CGRect dirtyRect)
         {
             NativeColor.Clear.Set ();
-            NativeGraphics.RectFill (dirtyRect);
+            var drawRect = Bounds;
+            drawRect.Intersect (dirtyRect);
+            NativeGraphics.RectFill (drawRect);
 
             var bounds = Bounds;
             if (bounds.Width < bounds.Height)

diff --git a/Editor/Mac/MarginView.cs b/Editor/Mac/MarginView.cs
@@ -32,7 +32,9 @@ class MarginView : DrawingView
         protected override void DrawDirtyRect (CGRect dirtyRect)
         {
             Theme.BackgroundColor.Set ();
-            NativeGraphics.RectFill (dirtyRect);
+            var drawRect = Bounds;
+            drawRect.Intersect (dirtyRect);
+            NativeGraphics.RectFill (drawRect);
 
             var la = Theme.LineNumberAttributes;
             var fontHeight = "123".StringSize (la).Height;