Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-01 16:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Revert "Illustrates #2331 (Scrollview not respecting clip) does not reproduce (#2332)" committed twice on 6bb90edcbf and 28d7be721c

Browse Source
This commit is contained in:
BDisp
2023-02-28 21:18:09 +00:00
parent 517ec9e988
commit ebae3a8560
4 changed files with 608 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
UnitTests/Core/BorderTests.cs
View File

@@ -1,15 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Reflection.Emit;
using Xunit;
using Xunit.Abstractions;
using Rune = System.Rune;
namespace Terminal.Gui.CoreTests {
public class BorderTests {
[Fact]
[AutoInitShutdown]
readonly ITestOutputHelper output;
public BorderTests (ITestOutputHelper output)
{
this.output = output;
}
[Fact, AutoInitShutdown]
public void Constructor_Defaults ()
{
var b = new Border ();
@@ -45,8 +49,7 @@ namespace Terminal.Gui.CoreTests {
Assert.False (b.DrawMarginFrame);
}
[Fact]
[AutoInitShutdown]
[Fact, AutoInitShutdown]
public void ActualWidth_ActualHeight ()
{
var v = new View (new Rect (5, 10, 60, 20), "", new Border ());
@@ -81,8 +84,7 @@ namespace Terminal.Gui.CoreTests {
Assert.Equal (new Thickness (5, 5, 5, 5), b.GetSumThickness ());
}
[Fact]
[AutoInitShutdown]
[Fact, AutoInitShutdown]
public void DrawContent_With_Child_Border ()
{
var top = Application.Top;
@@ -303,8 +305,7 @@ namespace Terminal.Gui.CoreTests {
}
}
[Fact]
[AutoInitShutdown]
[Fact, AutoInitShutdown]
public void DrawContent_With_Parent_Border ()
{
var top = Application.Top;
@@ -540,8 +541,7 @@ namespace Terminal.Gui.CoreTests {
}
}
[Fact]
[AutoInitShutdown]
[Fact, AutoInitShutdown]
public void BorderOnControlWithNoChildren ()
{
var label = new TextField ("Loading...") {
@@ -557,5 +557,57 @@ namespace Terminal.Gui.CoreTests {
Assert.Null (Record.Exception (() => label.Redraw (label.Bounds)));
}
[Fact, AutoInitShutdown]
public void BorderStyle_And_DrawMarginFrame_Gets_Sets ()
{
var lblTop = new Label ("At 0,0");
var lblFrame = new Label ("Centered") { X = Pos.Center (), Y = Pos.Center () };
var frame = new FrameView () { Y = 1, Width = 20, Height = 3 };
var lblFill = new Label () { Width = Dim.Fill(),Height = Dim.Fill(), Visible = false };
var fillText = new System.Text.StringBuilder ();
for (int i = 0; i < frame.Bounds.Height; i++) {
if (i > 0) {
fillText.AppendLine ("");
}
for (int j = 0; j < frame.Bounds.Width; j++) {
fillText.Append ("█");
}
}
lblFill.Text = fillText.ToString ();
frame.Add (lblFill, lblFrame);
var lblBottom = new Label ("At 0,4") { Y = 4 };
Application.Top.Add (lblTop, frame, lblBottom);
Application.Begin (Application.Top);
Assert.Equal (BorderStyle.Single, frame.Border.BorderStyle);
Assert.True (frame.Border.DrawMarginFrame);
TestHelpers.AssertDriverContentsWithFrameAre (@"
At 0,0
┌──────────────────┐
│ Centered │
└──────────────────┘
At 0,4 ", output);
frame.Border.BorderStyle = BorderStyle.None;
Application.Refresh ();
Assert.True (frame.Border.DrawMarginFrame);
TestHelpers.AssertDriverContentsWithFrameAre (@"
At 0,0
Centered
At 0,4 ", output);
frame.Border.DrawMarginFrame = false;
lblFill.Visible = true;
Application.Refresh ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
At 0,0
████████████████████
██████Centered██████
████████████████████
At 0,4 ", output);
}
}
}

228
UnitTests/Views/ScrollViewTests.cs
View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using NStack;
using Xunit;
using Xunit.Abstractions;
@@ -280,5 +276,227 @@ namespace Terminal.Gui.ViewTests {
◄░░░├─┤░►
", output);
}
[Fact, AutoInitShutdown]
public void Frame_And_Labels_Does_Not_Overspill_ScrollView ()
{
var sv = new ScrollView {
X = 3,
Y = 3,
Width = 10,
Height = 10,
ContentSize = new Size (50, 50)
};
for (int i = 0; i < 8; i++) {
sv.Add (new CustomButton ("█", $"Button {i}", 20, 3) { Y = i * 3 });
}
Application.Top.Add (sv);
Application.Begin (Application.Top);
TestHelpers.AssertDriverContentsWithFrameAre (@"
█████████▲
██████But┬
█████████┴
┌────────░
│ But░
└────────░
┌────────░
│ But░
└────────▼
◄├┤░░░░░► ", output);
sv.ContentOffset = new Point (5, 5);
Application.Refresh ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
─────────▲
─────────┬
Button 2│
─────────┴
─────────░
Button 3░
─────────░
─────────░
Button 4▼
◄├─┤░░░░► ", output);
}
private class CustomButton : FrameView {
private Label labelFill;
private Label labelText;
public CustomButton (string fill, ustring text, int width, int height)
{
Width = width;
Height = height;
labelFill = new Label () { AutoSize = false, Width = Dim.Fill (), Height = Dim.Fill (), Visible = false };
var fillText = new System.Text.StringBuilder ();
for (int i = 0; i < Bounds.Height; i++) {
if (i > 0) {
fillText.AppendLine ("");
}
for (int j = 0; j < Bounds.Width; j++) {
fillText.Append (fill);
}
}
labelFill.Text = fillText.ToString ();
labelText = new Label (text) { X = Pos.Center (), Y = Pos.Center () };
Add (labelFill, labelText);
CanFocus = true;
}
public override bool OnEnter (View view)
{
Border.BorderStyle = BorderStyle.None;
Border.DrawMarginFrame = false;
labelFill.Visible = true;
view = this;
return base.OnEnter (view);
}
public override bool OnLeave (View view)
{
Border.BorderStyle = BorderStyle.Single;
Border.DrawMarginFrame = true;
labelFill.Visible = false;
if (view == null)
view = this;
return base.OnLeave (view);
}
}
[Fact, AutoInitShutdown]
public void Clear_Window_Inside_ScrollView ()
{
var topLabel = new Label ("At 15,0") { X = 15 };
var sv = new ScrollView {
X = 3,
Y = 3,
Width = 10,
Height = 10,
ContentSize = new Size (23, 23),
KeepContentAlwaysInViewport = false
};
var bottomLabel = new Label ("At 15,15") { X = 15, Y = 15 };
Application.Top.Add (topLabel, sv, bottomLabel);
Application.Begin (Application.Top);
TestHelpers.AssertDriverContentsWithFrameAre (@"
At 15,0
▲
┬
┴
░
░
░
░
░
▼
◄├┤░░░░░►
At 15,15", output);
var attributes = new Attribute [] {
Colors.TopLevel.Normal,
Colors.TopLevel.Focus,
Colors.Base.Normal
};
TestHelpers.AssertDriverColorsAre (@"
00000000000000000000000
00000000000000000000000
00000000000000000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00011111111110000000000
00000000000000000000000
00000000000000000000000
00000000000000000000000", attributes);
sv.Add (new Window ("1") { X = 3, Y = 3, Width = 20, Height = 20 });
Application.Refresh ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
At 15,0
▲
┬
┴
┌ 1 ──░
│ ░
│ ░
│ ░
│ ░
│ ▼
◄├┤░░░░░►
At 15,15", output);
TestHelpers.AssertDriverColorsAre (@"
00000000000000000000000
00000000000000000000000
00000000000000000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000022222210000000000
00000022222210000000000
00000022222210000000000
00000022222210000000000
00000022222210000000000
00000022222210000000000
00011111111110000000000
00000000000000000000000
00000000000000000000000
00000000000000000000000", attributes);
sv.ContentOffset = new Point (20, 20);
Application.Refresh ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
At 15,0
│ ▲
│ ░
──┘ ░
░
░
┬
│
┴
▼
◄░░░░├─┤►
At 15,15", output);
TestHelpers.AssertDriverColorsAre (@"
00000000000000000000000
00000000000000000000000
00000000000000000000000
00022200000010000000000
00022200000010000000000
00022200000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00011111111110000000000
00000000000000000000000
00000000000000000000000
00000000000000000000000", attributes);
}
}
}