Merge pull request #6039 from MarchingCube/fix-textpresenter-caretbrush

Fix problems with mutable brush being passed to an immutable pen.
AvaloniaUI · Aug 17, 2021 · 4fe4f3e · 4fe4f3e
1 parent a78345a
commit 4fe4f3e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -361,9 +361,9 @@ public override void Render(DrawingContext context)
 
             RenderInternal(context);
 
-            if (selectionStart == selectionEnd)
+            if (selectionStart == selectionEnd && _caretBlink)
             {
-                var caretBrush = CaretBrush;
+                var caretBrush = CaretBrush?.ToImmutable();
 
                 if (caretBrush is null)
                 {
@@ -382,13 +382,10 @@ public override void Render(DrawingContext context)
                     }
                 }
 
-                if (_caretBlink)
-                {
-                    var (p1, p2) = GetCaretPoints();
-                    context.DrawLine(
-                        new ImmutablePen(caretBrush, 1),
-                        p1, p2);
-                }
+                var (p1, p2) = GetCaretPoints();
+                context.DrawLine(
+                    new ImmutablePen(caretBrush, 1),
+                    p1, p2);
             }
         }
 

diff --git a/src/Avalonia.Visuals/Media/Immutable/ImmutablePen.cs b/src/Avalonia.Visuals/Media/Immutable/ImmutablePen.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 
 namespace Avalonia.Media.Immutable
 {
@@ -44,6 +45,8 @@ public ImmutablePen(
             PenLineJoin lineJoin = PenLineJoin.Miter,
             double miterLimit = 10.0)
         {
+            Debug.Assert(!(brush is IMutableBrush));
+
             Brush = brush;
             Thickness = thickness;
             LineCap = lineCap;