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 #3127 - View Layout improvements - Redefines how LayoutStyle works. Fixes AutoSize etc... (#3130)

Browse Source 
* Removes CheckAbsoulte and updates unit tests to match

* Fixed code that was dependent on ToString behavior vs. direct test for null

* Dim/Pos != null WIP

* Moved AutoSize specific tests out of Pos/Dim tests

* Broke out AutoSize = false tests to new file

* Commented test TODOs

* New test

* Removed unused API and cleaned up code

* Removed unused API and cleaned up code

* Cleaned up code

* Cleaned up code

* reorg'd Toplevel tests

* Fixed Create and related unit tests

* Added test from #3136

* Removed TopLevel.Create

* Fixed SetCurrentOverlappedAsTop

* Updated pull request template

* Updated pull request template

* Revert "Updated pull request template"

This reverts commit d807190dd9.

* reverting

* re-reverting

* Fixed every thing but autosize scenarios??

* Fixed hexview

* Fixed contextmenu

* Fixed more minor issues in tests

* Fixed more minor issues in tests

* Debugging Dialog test failure

* Fixed bad Dialog test. Was cleary invalid

* Fixed OnResizeNeeded bug

* Fixed OnResizeNeeded bug

* Fixed UICatalog to not eat exceptions

* Fixed TextView

* Removed Frame overrides

* Made Frame non-virtual

* Fixed radioGroup

* Fixed TabView

* Hcked ScrolLBarView unit tests to pass

* All AutoSize tests pass!

* All tests pass!!!!!!!

* Updated API docs. Cleaned up code.

* Fixed ColorPicker

* Added 'Bounds =' unit tests

* Refactored TextFormatter.Size setting logic

* Cleaned up OnResizeNeeded (api docs and usages)

* Merges in #3019 changes. Makes OnResizeNeeded non-virtual. If we find a use-case where someone wants to override it we can change this back.

* Fixed FileDialog bounds warning

* Removed resharper settings from editorconfig

* Added Pos.Center test to AllViewsTests.cs.
Modernized RadioGroup.
Fixed ProgressBar.

* Reverted formatting

* Reverted formatting

* Reverted formatting

* Reverted formatting

* Reverted formatting

* Reverted formatting

* Reverted formatting

* Code cleanup

* Code cleanup

* Code cleanup

* Code cleanup

* Code cleanup

* Code cleanup

* Code cleanup

* Code cleanup

* Reverted formatting
This commit is contained in:
Tig
2024-01-12 17:43:35 -07:00
committed by GitHub
parent 4cc6339192
commit d2ad11248f
78 changed files with 21739 additions and 20765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

420
UnitTests/Views/ScrollViewTests.cs
View File

@@ -16,14 +16,10 @@ namespace Terminal.Gui.ViewsTests {
public void Constructors_Defaults ()
{
var sv = new ScrollView ();
Assert.Equal (LayoutStyle.Computed, sv.LayoutStyle);
Assert.Equal (LayoutStyle.Absolute, sv.LayoutStyle);
Assert.True (sv.CanFocus);
Assert.Equal (new Rect (0, 0, 0, 0), sv.Frame);
Assert.Equal (Rect.Empty, sv.Frame);
Assert.Null (sv.X);
Assert.Null (sv.Y);
Assert.Null (sv.Width);
Assert.Null (sv.Height);
Assert.Equal (Point.Empty, sv.ContentOffset);
Assert.Equal (Size.Empty, sv.ContentSize);
Assert.True (sv.AutoHideScrollBars);
@@ -33,10 +29,6 @@ namespace Terminal.Gui.ViewsTests {
Assert.Equal (LayoutStyle.Absolute, sv.LayoutStyle);
Assert.True (sv.CanFocus);
Assert.Equal (new Rect (1, 2, 20, 10), sv.Frame);
Assert.Null (sv.X);
Assert.Null (sv.Y);
Assert.Null (sv.Width);
Assert.Null (sv.Height);
Assert.Equal (Point.Empty, sv.ContentOffset);
Assert.Equal (Size.Empty, sv.ContentSize);
Assert.True (sv.AutoHideScrollBars);
@@ -196,6 +188,8 @@ namespace Terminal.Gui.ViewsTests {
Application.Top.Add (sv);
Application.Begin (Application.Top);
Assert.Equal (new Rect (0, 0, 10, 10), sv.Bounds);
Assert.False (sv.AutoHideScrollBars);
Assert.True (sv.ShowHorizontalScrollIndicator);
Assert.True (sv.ShowVerticalScrollIndicator);
@@ -214,7 +208,9 @@ namespace Terminal.Gui.ViewsTests {
", output);
sv.ShowHorizontalScrollIndicator = false;
Assert.Equal (new Rect (0, 0, 10, 10), sv.Bounds);
sv.ShowVerticalScrollIndicator = true;
Assert.Equal (new Rect (0, 0, 10, 10), sv.Bounds);
Assert.False (sv.AutoHideScrollBars);
Assert.False (sv.ShowHorizontalScrollIndicator);
@@ -228,6 +224,7 @@ namespace Terminal.Gui.ViewsTests {
│
│
│
│
┴
▼
", output);
@@ -249,7 +246,7 @@ namespace Terminal.Gui.ViewsTests {
◄├─────┤►
◄├──────┤►
", output);
sv.ShowHorizontalScrollIndicator = false;
@@ -373,235 +370,234 @@ namespace Terminal.Gui.ViewsTests {
", output);
}
// BUGBUG: v2 - I can't figure out what this test is trying to test and it fails in weird ways
// Disabling for now
//[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);
// There still have an issue with lower right corner of the scroll view
[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);
TestHelpers.AssertDriverContentsWithFrameAre (@"
█████████▲
██████But┬
█████████┴
┌────────░
│ But░
└────────░
┌────────░
│ But░
└────────▼
◄├┤░░░░░►─", output);
// sv.ContentOffset = new Point (5, 5);
// sv.LayoutSubviews ();
// Application.Refresh ();
// TestHelpers.AssertDriverContentsWithFrameAre (@"
// ─────────▲
// ─────────┬
// Button 2│
// ─────────┴
// ─────────░
// Button 3░
// ─────────░
// ─────────░
// Button 4▼
// ◄├─┤░░░░► ", output);
//}
sv.ContentOffset = new Point (5, 5);
sv.LayoutSubviews ();
Application.Refresh ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
─────────▲
─────────┬
Button 2│
─────────┴
─────────░
Button 3░
─────────░
─────────░
Button 4▼
◄├─┤░░░░►─", output);
}
//private class CustomButton : FrameView {
// private Label labelFill;
// private Label labelText;
private class CustomButton : FrameView {
private Label labelFill;
private Label labelText;
// public CustomButton (string fill, string text, int width, int height) : base ()
// {
// Width = width;
// Height = height;
// labelFill = new Label () { AutoSize = false, X = Pos.Center (), Y = Pos.Center (), Width = Dim.Fill (), Height = Dim.Fill (), Visible = false };
// labelFill.LayoutComplete += (s, e) => {
// var fillText = new System.Text.StringBuilder ();
// for (int i = 0; i < labelFill.Bounds.Height; i++) {
// if (i > 0) {
// fillText.AppendLine ("");
// }
// for (int j = 0; j < labelFill.Bounds.Width; j++) {
// fillText.Append (fill);
// }
// }
// labelFill.Text = fillText;
// };
public CustomButton (string fill, string text, int width, int height) : base ()
{
Width = width;
Height = height;
//labelFill = new Label () { AutoSize = false, X = Pos.Center (), Y = Pos.Center (), Width = Dim.Fill (), Height = Dim.Fill (), Visible = false };
labelFill = new Label () { AutoSize = false, Width = Dim.Fill (), Height = Dim.Fill (), Visible = false };
labelFill.LayoutComplete += (s, e) => {
var fillText = new System.Text.StringBuilder ();
for (int i = 0; i < labelFill.Bounds.Height; i++) {
if (i > 0) {
fillText.AppendLine ("");
}
for (int j = 0; j < labelFill.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;
// }
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 OnEnter (View view)
{
Border.BorderStyle = LineStyle.None;
Border.Thickness = new Thickness (0);
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);
// }
//}
public override bool OnLeave (View view)
{
Border.BorderStyle = LineStyle.Single;
Border.Thickness = new Thickness (1);
labelFill.Visible = false;
if (view == null)
view = this;
return base.OnLeave (view);
}
}
// There are still issue with the lower right corner of the scroll 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);
// BUGBUG: Broke this test with #2483 - @bdisp I need your help figuring out why
// [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
TestHelpers.AssertDriverContentsWithFrameAre (@"
At 15,0
// ▲
// ┬
// ┴
// ░
// ░
// ░
// ░
// ░
// ▼
// ◄├┤░░░░░►
▲
┬
┴
░
░
░
░
░
▼
◄├┤░░░░░►
// At 15,15", output);
At 15,15", output);
// var attributes = new Attribute [] {
// Colors.TopLevel.Normal,
// Colors.TopLevel.Focus,
// Colors.Base.Normal
// };
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);
TestHelpers.AssertDriverColorsAre (@"
00000000000000000000000
00000000000000000000000
00000000000000000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00011111111100000000000
00000000000000000000000
00000000000000000000000
00000000000000000000000", null, attributes);
// sv.Add (new Window { X = 3, Y = 3, Width = 20, Height = 20 });
sv.Add (new Window { X = 3, Y = 3, Width = 20, Height = 20 });
// Application.Refresh ();
// TestHelpers.AssertDriverContentsWithFrameAre (@"
// At 15,0
Application.Refresh ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
At 15,0
// ▲
// ┬
// ┴
// ┌─────░
// │ ░
// │ ░
// │ ░
// │ ░
// │ ▼
// ◄├┤░░░░░►
▲
┬
┴
┌─────░
│ ░
│ ░
│ ░
│ ░
│ ▼
◄├┤░░░░░►
// At 15,15", output);
At 15,15", output);
// TestHelpers.AssertDriverColorsAre (@"
//00000000000000000000000
//00000000000000000000000
//00000000000000000000000
//00000000000010000000000
//00000000000010000000000
//00000000000010000000000
//00000022222210000000000
//00000022222210000000000
//00000022222210000000000
//00000022222210000000000
//00000022222210000000000
//00000022222210000000000
//00011111111110000000000
//00000000000000000000000
//00000000000000000000000
//00000000000000000000000", attributes);
TestHelpers.AssertDriverColorsAre (@"
00000000000000000000000
00000000000000000000000
00000000000000000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000022222210000000000
00000022222210000000000
00000022222210000000000
00000022222210000000000
00000022222210000000000
00000022222210000000000
00011111111120000000000
00000000000000000000000
00000000000000000000000
00000000000000000000000", null, attributes);
// sv.ContentOffset = new Point (20, 20);
// Application.Refresh ();
// TestHelpers.AssertDriverContentsWithFrameAre (@"
// At 15,0
sv.ContentOffset = new Point (20, 20);
Application.Refresh ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
At 15,0
// │ ▲
// │ ░
// ──┘ ░
// ░
// ░
// ┬
// │
// ┴
// ▼
// ◄░░░░├─┤►
│ ▲
│ ░
──┘ ░
░
░
┬
│
┴
▼
◄░░░░├─┤►
// At 15,15", output);
At 15,15", output);
// TestHelpers.AssertDriverColorsAre (@"
//00000000000000000000000
//00000000000000000000000
//00000000000000000000000
//00022200000010000000000
//00022200000010000000000
//00022200000010000000000
//00000000000010000000000
//00000000000010000000000
//00000000000010000000000
//00000000000010000000000
//00000000000010000000000
//00000000000010000000000
//00011111111110000000000
//00000000000000000000000
//00000000000000000000000
//00000000000000000000000", attributes);
// }
TestHelpers.AssertDriverColorsAre (@"
00000000000000000000000
00000000000000000000000
00000000000000000000000
00022200000010000000000
00022200000010000000000
00022200000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00011111111100000000000
00000000000000000000000
00000000000000000000000
00000000000000000000000", null, attributes);
}
[Fact, AutoInitShutdown]
public void DrawTextFormatter_Respects_The_Clip_Bounds ()