Merge branch 'main' into cleanup-15-dec-2024

jinek · Dec 15, 2024 · fb64bde · fb64bde
2 parents cb705b5 + 0983f49
commit fb64bde
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Consolonia.Core/Drawing/DrawingContextImpl.cs b/src/Consolonia.Core/Drawing/DrawingContextImpl.cs
@@ -266,8 +266,10 @@ public void DrawGeometry(IBrush brush, IPen pen, IGeometryImpl geometry)
                 FillRectangleWithBrush(brush, pen, r);
             }
 
-            if (pen is null or { Thickness: 0 }
-                or { Brush: null }) return;
+            if (pen is null
+                or { Thickness: 0 }
+                or { Brush: null }
+                or { Brush: LineBrush { Brush: null } }) return;
             DrawBoxLineInternal(pen, new Line(r.TopLeft, false, (int)r.Width), RectangleLinePosition.Top);
             DrawBoxLineInternal(pen, new Line(r.BottomLeft, false, (int)r.Width), RectangleLinePosition.Bottom);
             DrawBoxLineInternal(pen, new Line(r.TopLeft, true, (int)r.Height), RectangleLinePosition.Left);

diff --git a/src/Consolonia.Core/Drawing/LineBrush.cs b/src/Consolonia.Core/Drawing/LineBrush.cs
@@ -9,7 +9,8 @@ public class LineBrush : Animatable, IImmutableBrush
     {
         //todo: we don't really implement immutable brush
         public static readonly StyledProperty<IBrush> BrushProperty =
-            AvaloniaProperty.Register<LineBrush, IBrush>(CommonInternalHelper.GetStyledPropertyName());
+            AvaloniaProperty.Register<LineBrush, IBrush>(
+                CommonInternalHelper.GetStyledPropertyName() /*todo: re-use this method everywhere*/);
 
         public static readonly StyledProperty<LineStyle> LineStyleProperty =
             AvaloniaProperty.Register<LineBrush, LineStyle>(CommonInternalHelper.GetStyledPropertyName());