Tig 1 month ago
parent
commit
fec8014144

+ 4 - 4
Terminal.Gui/ViewBase/Adornment/Border.cs

@@ -500,7 +500,7 @@ public partial class Border : Adornment
 
 
                 if (drawTop)
                 if (drawTop)
                 {
                 {
-                    hruler.Draw (new (screenBounds.X, screenBounds.Y));
+                    hruler.Draw (new (screenBounds.X, screenBounds.Y), driver: Driver);
                 }
                 }
 
 
                 // Redraw title 
                 // Redraw title 
@@ -518,19 +518,19 @@ public partial class Border : Adornment
 
 
                 if (drawLeft)
                 if (drawLeft)
                 {
                 {
-                    vruler.Draw (new (screenBounds.X, screenBounds.Y + 1), 1);
+                    vruler.Draw (new (screenBounds.X, screenBounds.Y + 1), 1, driver: Driver);
                 }
                 }
 
 
                 // Bottom
                 // Bottom
                 if (drawBottom)
                 if (drawBottom)
                 {
                 {
-                    hruler.Draw (new (screenBounds.X, screenBounds.Y + screenBounds.Height - 1));
+                    hruler.Draw (new (screenBounds.X, screenBounds.Y + screenBounds.Height - 1), driver: Driver);
                 }
                 }
 
 
                 // Right
                 // Right
                 if (drawRight)
                 if (drawRight)
                 {
                 {
-                    vruler.Draw (new (screenBounds.X + screenBounds.Width - 1, screenBounds.Y + 1), 1);
+                    vruler.Draw (new (screenBounds.X + screenBounds.Width - 1, screenBounds.Y + 1), 1, driver: Driver);
                 }
                 }
             }
             }
 
 

+ 2 - 1
Tests/UnitTestsParallelizable/View/Draw/ViewDrawingClippingTests.cs

@@ -22,7 +22,7 @@ public class ViewDrawingClippingTests (ITestOutputHelper output) : FakeDriverBas
         Assert.NotNull (result);
         Assert.NotNull (result);
         Assert.Equal (region, result);
         Assert.Equal (region, result);
     }
     }
-    
+
     [Fact]
     [Fact]
     public void SetClip_NullRegion_DoesNothing ()
     public void SetClip_NullRegion_DoesNothing ()
     {
     {
@@ -649,6 +649,7 @@ public class ViewDrawingClippingTests (ITestOutputHelper output) : FakeDriverBas
 
 
         view.Draw ();
         view.Draw ();
 
 
+        Assert.Equal (originalClip, driver.Clip);
         // After draw, clip should be restored (though it may be modified)
         // After draw, clip should be restored (though it may be modified)
         Assert.NotNull (driver.Clip);
         Assert.NotNull (driver.Clip);
     }
     }