Fixes #4057 - MASSIVE! Fully implements ColorScheme->Scheme + VisualRole + Colors.->SchemeManager. (#4062)

* touching publish.yml

* ColorScheme->Scheme

* ColorScheme->Scheme 2

* Prototype of GetAttributeForRole

* Badly broke CM

* Further Badly broke CM

* Refactored CM big-time. View still broken

* All unit test pass again. Tons added. CM is still WIP, but Schemes is not mostly refactored and working.

* Actually:
All unit test pass again.
Tons added.
CM is still WIP, but Schemes is not mostly refactored and working.

* Bug fixes.
DeepMemberWiseClone cleanup

* Further cleanup of Scope<T>, ConfigProperty, etc.

* Made ConfigManager thread safe.

* WIP: Broken

* WIP: new deep clone impl

* WIP: new deep clone impl is done. Now fixing CM

* WIP:
- config.md
- Working on AOT clean up
- Core CM is broken; but known.

* WIP

* Merged.
Removed CM from Application.Init

* WIP

* More WIP; Less broke

* All CM unit tests pass... Not sure if it actually works though

* All unit tests pass... Themes are broken though in UI Cat

* CM Ready for review?

* Fixed failures due to TextStyles PR

* Working on Scheme/Attribute

* Working on Scheme/Attribute 2

* Working on Scheme/Attribute 3

* Working on Scheme/Attribute 4

* Working on Scheme/Attribute 5

* Working on Scheme/Attribute 6

* Added test to show how awful memory usage is

* Improved schema. Updated config.json

* Nade Scope<T> concurrentdictionary and added test to prove

* Made Themes ConcrurrentDictionary. Added bunches of tests

* Code cleanup

* Code cleanup 2

* Code cleanup 3

* Tweaking Scheme

* ClearJsonErrors

* ClearJsonErrors2

* Updated Attribute API

* It all (mostly) works!

* Skip odd unit test

* Messed with Themes

* Theme tweaks

* Code reorg. New .md stuff

* Fixed Enabled. Added mock driver

* Fixed a bunch of View.Enabled related issues

* Scheme -> Get/SetScheme()

* Cleanup

* Cleanup2

* Broke something

* Fixed everything

* Made CM.Enable better

* Text Style Scenario

* Added comments

* Fixed UI Catalog Theme Changing

* Fixed more dynamic CM update stuff

* Warning cleanup

* New Default Theme

* fixed unit test

* Refactoring Scheme and Attribute to fix inheritance

* more unit tests

* ConfigProperty is not updating schemes correctly

* All unit tests pass.
Code cleanup

* All unit tests pass.
Code cleanup2

* Fixed unit tests

* Upgraded TextField and TextView

* Fixed TextView !Enabled bug

* More updates to TextView. More unit tests for SchemeManager

* Upgraded CharMap

* API docs

* Fixe HexView API

* upgrade HexView

* Fixed shortcut KeyView

* Fixed more bugs. Added new themes

* updated themes

* upgraded Border

* Fixed themes memory usage...mostly

* Fixed themes memory usage...mostly2

* Fixed themes memory usage...2

* Fixed themes memory usage...3

* Added new colors

* Fixed GetHardCodedConfig bug

* Added Themes Scenario - WIP

* Added Themes Scenario

* Tweaked Themes Scenario

* Code cleanup

* Fixed json schmea

* updated deepdives

* updated deepdives

* Tweaked Themes Scenario

* Made Schemes a concurrent dict

* Test cleanup

* Thread safe ConfigProperty tests

* trying to make things more thread safe

* more trying to make things more thread safe

* Fixing bugs in shadowview

* Fixing bugs in shadowview 2

* Refactored GetViewsUnderMouse to GetViewsUnderLocation etc...

* Fixed dupe unit tests?

* Added better description of layout and coordiantes to deep dive

* Added better description of layout and coordiantes to deep dive

* Modified tests that call v2.AddTimeout; they were returning true which means restart the timer!
This was causing mac/linux unit test failures.
I think

* Fixed auto scheme.
Broke TextView/TextField selection

* Realized Attribute.IsExplicitlySet is stupid; just use nullable

* Fixed Attribute. Simplified. MOre theme testing

* Updated themes again

* GetViewsUnderMouse to GetViewsUnderLocation broke TransparentMouse.

* Fixing mouseunder bugs

* rewriting...

* All working again.
Shadows are now slick as snot.
GetViewsUnderLocation is rewritten to actually work and be readable.
Tons more low-level unit tests.
Margin is now actually ViewportSettings.Transparent.

* Code cleanup

* Code cleanup

* Code cleanup of color apis

* Fixed Hover/Highlight

* Update Examples/UICatalog/Scenarios/AllViewsTester.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Examples/UICatalog/Scenarios/CharacterMap/CharacterMap.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Examples/UICatalog/Scenarios/Clipping.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Fixed race condition?

* reverted

* Simplified Attribute API by removing events from SetAttributeForRole

* Removed recursion from GetViewsAtLocation

* Removed unneeded code

* Code clean up.
Fixed Scheme bug.

* reverted temporary disable

* Adjusted scheme algo

* Upgraded TextValidateField

* Fixed TextValidate bugs

* Tweaks

* Frameview rounded border by default

* API doc cleanup

* Readme fix

* Addressed tznind feeback

* Fixed more unit test issues by protecting Application statics from being set if Application.Initialized is not true

* Fixed more unit test issues by protecting Application statics from being set if Application.Initialized is not true 2

* cleanup

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Tig
2025-05-29 13:55:54 -06:00
committed by GitHub
parent 9c54ee41e5
commit 7422385457
386 changed files with 23600 additions and 13662 deletions

View File

@@ -0,0 +1,66 @@
using UnitTests;
using Xunit.Abstractions;
namespace Terminal.Gui.ViewTests;
public class MarginTests
{
[Fact]
public void Is_Visually_Transparent ()
{
var view = new View { Height = 3, Width = 3 };
Assert.True(view.Margin!.ViewportSettings.HasFlag(ViewportSettings.Transparent), "Margin should be transparent by default.");
}
[Fact]
public void Is_Transparent_To_Mouse ()
{
var view = new View { Height = 3, Width = 3 };
Assert.True (view.Margin!.ViewportSettings.HasFlag (ViewportSettings.TransparentMouse), "Margin should be transparent to mouse by default.");
}
[Fact]
public void When_Not_Visually_Transparent ()
{
var view = new View { Height = 3, Width = 3 };
// Give the Margin some size
view.Margin!.Thickness = new Thickness (1, 1, 1, 1);
// Give it Text
view.Margin.Text = "Test";
// Strip off ViewportSettings.Transparent
view.Margin!.ViewportSettings &= ~ViewportSettings.Transparent;
//
}
[Fact]
public void Thickness_Is_Empty_By_Default ()
{
var view = new View { Height = 3, Width = 3 };
Assert.Equal (Thickness.Empty, view.Margin!.Thickness);
}
// ShadowStyle
[Fact]
public void Margin_Uses_ShadowStyle_Transparent ()
{
var view = new View { Height = 3, Width = 3, ShadowStyle = ShadowStyle.Transparent };
Assert.Equal (ShadowStyle.Transparent, view.Margin!.ShadowStyle);
Assert.True (view.Margin.ViewportSettings.HasFlag (ViewportSettings.TransparentMouse), "Margin should be transparent to mouse when ShadowStyle is Transparent.");
Assert.True (view.Margin!.ViewportSettings.HasFlag (ViewportSettings.Transparent), "Margin should be transparent when ShadowStyle is Transparent..");
}
[Fact]
public void Margin_Uses_ShadowStyle_Opaque ()
{
var view = new View { Height = 3, Width = 3, ShadowStyle = ShadowStyle.Opaque };
Assert.Equal (ShadowStyle.Opaque, view.Margin!.ShadowStyle);
Assert.True (view.Margin.ViewportSettings.HasFlag (ViewportSettings.TransparentMouse), "Margin should be transparent to mouse when ShadowStyle is Opaque.");
Assert.True (view.Margin!.ViewportSettings.HasFlag (ViewportSettings.Transparent), "Margin should be transparent when ShadowStyle is Opaque..");
}
}

View File

@@ -1,30 +0,0 @@
#nullable enable
namespace Terminal.Gui.ViewTests;
[Trait ("Category", "Output")]
public class ColorSchemeTests
{
[Fact]
public void GetHotNormalColor_ColorScheme ()
{
var view = new View { ColorScheme = Colors.ColorSchemes ["Base"] };
Assert.Equal (view.ColorScheme!.HotNormal, view.GetHotNormalColor ());
view.Enabled = false;
Assert.Equal (view.ColorScheme.Disabled, view.GetHotNormalColor ());
view.Dispose ();
}
[Fact]
public void GetNormalColor_ColorScheme ()
{
var view = new View { ColorScheme = Colors.ColorSchemes ["Base"] };
Assert.Equal (view.ColorScheme!.Normal, view.GetNormalColor ());
view.Enabled = false;
Assert.Equal (view.ColorScheme.Disabled, view.GetNormalColor ());
view.Dispose ();
}
}

View File

@@ -238,7 +238,7 @@ public class NeedsDrawTests
};
Assert.Equal (new (0, 0, 10, 10), superView.Frame);
Assert.Equal (new (0, 0, 10, 10), superView.Viewport);
Assert.Equal (new (0, 0, 10, 10), superView._needsDrawRect);
Assert.Equal (new (0, 0, 10, 10), superView.NeedsDrawRect);
var view = new View
{
@@ -248,49 +248,49 @@ public class NeedsDrawTests
view.Frame = new (0, 1, 2, 3);
Assert.Equal (new (0, 1, 2, 3), view.Frame);
Assert.Equal (new (0, 0, 2, 3), view.Viewport);
Assert.Equal (new (0, 0, 2, 3), view._needsDrawRect);
Assert.Equal (new (0, 0, 2, 3), view.NeedsDrawRect);
superView.Add (view);
Assert.Equal (new (0, 0, 10, 10), superView.Frame);
Assert.Equal (new (0, 0, 10, 10), superView.Viewport);
Assert.Equal (new (0, 0, 10, 10), superView._needsDrawRect);
Assert.Equal (new (0, 0, 10, 10), superView.NeedsDrawRect);
Assert.Equal (new (0, 1, 2, 3), view.Frame);
Assert.Equal (new (0, 0, 2, 3), view.Viewport);
Assert.Equal (new (0, 0, 2, 3), view._needsDrawRect);
Assert.Equal (new (0, 0, 2, 3), view.NeedsDrawRect);
view.Frame = new (3, 3, 5, 5);
Assert.Equal (new (3, 3, 5, 5), view.Frame);
Assert.Equal (new (0, 0, 5, 5), view.Viewport);
Assert.Equal (new (0, 0, 5, 5), view._needsDrawRect);
Assert.Equal (new (0, 0, 5, 5), view.NeedsDrawRect);
view.Frame = new (3, 3, 6, 6); // Grow right/bottom 1
Assert.Equal (new (3, 3, 6, 6), view.Frame);
Assert.Equal (new (0, 0, 6, 6), view.Viewport);
Assert.Equal (new (0, 0, 6, 6), view._needsDrawRect);
Assert.Equal (new (0, 0, 6, 6), view.NeedsDrawRect);
view.Frame = new (3, 3, 5, 5); // Shrink right/bottom 1
Assert.Equal (new (3, 3, 5, 5), view.Frame);
Assert.Equal (new (0, 0, 5, 5), view.Viewport);
Assert.Equal (new (0, 0, 5, 5), view._needsDrawRect);
Assert.Equal (new (0, 0, 5, 5), view.NeedsDrawRect);
view.SetContentSize (new (10, 10));
Assert.Equal (new (3, 3, 5, 5), view.Frame);
Assert.Equal (new (0, 0, 5, 5), view.Viewport);
Assert.Equal (new (0, 0, 5, 5), view._needsDrawRect);
Assert.Equal (new (0, 0, 5, 5), view.NeedsDrawRect);
view.Viewport = new (1, 1, 5, 5); // Scroll up/left 1
Assert.Equal (new (3, 3, 5, 5), view.Frame);
Assert.Equal (new (1, 1, 5, 5), view.Viewport);
Assert.Equal (new (0, 0, 5, 5), view._needsDrawRect);
Assert.Equal (new (0, 0, 5, 5), view.NeedsDrawRect);
view.Frame = new (3, 3, 6, 6); // Grow right/bottom 1
Assert.Equal (new (3, 3, 6, 6), view.Frame);
Assert.Equal (new (1, 1, 6, 6), view.Viewport);
Assert.Equal (new (1, 1, 6, 6), view._needsDrawRect);
Assert.Equal (new (1, 1, 6, 6), view.NeedsDrawRect);
view.Frame = new (3, 3, 5, 5);
Assert.Equal (new (3, 3, 5, 5), view.Frame);
Assert.Equal (new (1, 1, 5, 5), view.Viewport);
Assert.Equal (new (1, 1, 5, 5), view._needsDrawRect);
Assert.Equal (new (1, 1, 5, 5), view.NeedsDrawRect);
}
}

View File

@@ -0,0 +1,407 @@
#nullable enable
namespace Terminal.Gui.ViewMouseTests;
[Trait ("Category", "Layout")]
public class GetViewsAtLocationTests
{
private class TestView : View
{
public TestView (int x, int y, int w, int h, bool visible = true)
{
X = x;
Y = y;
Width = w;
Height = h;
base.Visible = visible;
}
}
[Fact]
public void ReturnsEmpty_WhenRootIsNull ()
{
var result = View.GetViewsAtLocation (null, new Point (0, 0));
Assert.Empty (result);
}
[Fact]
public void ReturnsEmpty_WhenRootIsNotVisible ()
{
TestView root = new (0, 0, 10, 10, visible: false);
var result = View.GetViewsAtLocation (root, new Point (5, 5));
Assert.Empty (result);
}
[Fact]
public void ReturnsEmpty_WhenPointOutsideRoot ()
{
TestView root = new (0, 0, 10, 10);
var result = View.GetViewsAtLocation (root, new Point (20, 20));
Assert.Empty (result);
}
[Fact]
public void ReturnsEmpty_WhenPointOutsideRoot_AndSubview ()
{
TestView root = new (0, 0, 10, 10);
TestView sub = new (5, 5, 2, 2);
root.Add (sub);
var result = View.GetViewsAtLocation (root, new Point (20, 20));
Assert.Empty (result);
}
[Fact]
public void ReturnsRoot_WhenPointInsideRoot_NoSubviews ()
{
TestView root = new (0, 0, 10, 10);
var result = View.GetViewsAtLocation (root, new Point (5, 5));
Assert.Single (result);
Assert.Equal (root, result [0]);
}
[Fact]
public void ReturnsRoot_And_Subview_WhenPointInsideRootMargin ()
{
TestView root = new (0, 0, 10, 10);
root.Margin!.Thickness = new (1);
TestView sub = new (2, 2, 5, 5);
root.Add (sub);
var result = View.GetViewsAtLocation (root, new Point (3, 3));
Assert.Equal (2, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (sub, result [1]);
}
[Fact]
public void ReturnsRoot_And_Subview_Border_WhenPointInsideRootMargin ()
{
TestView root = new (0, 0, 10, 10);
root.Margin!.Thickness = new (1);
TestView sub = new (2, 2, 5, 5);
sub.BorderStyle = LineStyle.Dotted;
root.Add (sub);
var result = View.GetViewsAtLocation (root, new Point (3, 3));
Assert.Equal (3, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (sub, result [1]);
Assert.Equal (sub.Border, result [2]);
}
[Fact]
public void ReturnsRoot_And_Margin_WhenPointInside_With_Margin ()
{
TestView root = new (0, 0, 10, 10);
root.Margin!.Thickness = new (1);
var result = View.GetViewsAtLocation (root, new Point (0, 0));
Assert.Equal (2, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (root.Margin, result [1]);
}
[Fact]
public void ReturnsRoot_WhenPointOutsideSubview_With_Margin ()
{
TestView root = new (0, 0, 10, 10);
root.Margin!.Thickness = new (1);
TestView sub = new (2, 2, 5, 5);
root.Add (sub);
List<View?> result = View.GetViewsAtLocation (root, new Point (2, 2));
Assert.Single (result);
Assert.Equal (root, result [0]);
result = View.GetViewsAtLocation (root, new Point (0, 0));
Assert.Equal (2, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (root.Margin, result [1]);
result = View.GetViewsAtLocation (root, new Point (1, 1));
Assert.Single (result);
Assert.Equal (root, result [0]);
result = View.GetViewsAtLocation (root, new Point (8, 8));
Assert.Single (result);
Assert.Equal (root, result [0]);
}
[Fact]
public void ReturnsRoot_And_Border_WhenPointInside_With_Border ()
{
TestView root = new (0, 0, 10, 10);
root.Border!.Thickness = new (1);
var result = View.GetViewsAtLocation (root, new Point (0, 0));
Assert.Equal (2, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (root.Border, result [1]);
}
[Fact]
public void ReturnsRoot_WhenPointOutsideSubview_With_Border ()
{
TestView root = new (0, 0, 10, 10);
root.Border!.Thickness = new (1);
TestView sub = new (2, 2, 5, 5);
root.Add (sub);
var result = View.GetViewsAtLocation (root, new Point (2, 2));
Assert.Single (result);
Assert.Equal (root, result [0]);
result = View.GetViewsAtLocation (root, new Point (0, 0));
Assert.Equal (2, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (root.Border, result [1]);
result = View.GetViewsAtLocation (root, new Point (1, 1));
Assert.Single (result);
Assert.Equal (root, result [0]);
result = View.GetViewsAtLocation (root, new Point (8, 8));
Assert.Single (result);
Assert.Equal (root, result [0]);
}
[Fact]
public void ReturnsRoot_And_Border_WhenPointInsideRootBorder ()
{
TestView root = new (0, 0, 10, 10);
root.Border!.Thickness = new (1);
var result = View.GetViewsAtLocation (root, new Point (0, 0));
Assert.Equal (2, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (root.Border, result [1]);
}
[Fact]
public void ReturnsRoot_And_Padding_WhenPointInsideRootPadding ()
{
TestView root = new (0, 0, 10, 10);
root.Padding!.Thickness = new (1);
var result = View.GetViewsAtLocation (root, new Point (0, 0));
Assert.Equal (2, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (root.Padding, result [1]);
}
[Fact]
public void ReturnsRootAndSubview_WhenPointInsideSubview ()
{
TestView root = new (0, 0, 10, 10);
TestView sub = new (2, 2, 5, 5);
root.Add (sub);
var result = View.GetViewsAtLocation (root, new Point (3, 3));
Assert.Equal (2, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (sub, result [1]);
}
[Fact]
public void ReturnsRootAndSubviewAndMargin_WhenPointInsideSubviewMargin ()
{
TestView root = new (0, 0, 10, 10);
TestView sub = new (2, 2, 5, 5);
sub.Margin!.Thickness = new (1);
root.Add (sub);
var result = View.GetViewsAtLocation (root, new Point (6, 6));
Assert.Equal (3, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (sub, result [1]);
Assert.Equal (sub.Margin, result [2]);
}
[Fact]
public void ReturnsRootAndSubviewAndBorder_WhenPointInsideSubviewBorder ()
{
TestView root = new (0, 0, 10, 10);
TestView sub = new (2, 2, 5, 5);
sub.Border!.Thickness = new (1);
root.Add (sub);
var result = View.GetViewsAtLocation (root, new Point (2, 2));
Assert.Equal (3, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (sub, result [1]);
Assert.Equal (sub.Border, result [2]);
}
[Fact]
public void ReturnsRootAndSubviewAndSubviewAndBorder_WhenPointInsideSubviewBorder ()
{
TestView root = new (2, 2, 10, 10);
TestView sub = new (2, 2, 5, 5);
sub.Border!.Thickness = new (1);
root.Add (sub);
var result = View.GetViewsAtLocation (root, new Point (4, 4));
Assert.Equal (3, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (sub, result [1]);
Assert.Equal (sub.Border, result [2]);
}
[Fact]
public void ReturnsRootAndSubviewAndBorder_WhenPointInsideSubviewPadding ()
{
TestView root = new (0, 0, 10, 10);
TestView sub = new (2, 2, 5, 5);
sub.Padding!.Thickness = new (1);
root.Add (sub);
var result = View.GetViewsAtLocation (root, new Point (2, 2));
Assert.Equal (3, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (sub, result [1]);
Assert.Equal (sub.Padding, result [2]);
}
[Fact]
public void ReturnsRootAndSubviewAndMarginAndShadowView_WhenPointInsideSubviewMargin ()
{
TestView root = new (0, 0, 10, 10);
TestView sub = new (2, 2, 5, 5);
sub.ShadowStyle = ShadowStyle.Opaque;
root.Add (sub);
root.Layout ();
var result = View.GetViewsAtLocation (root, new Point (6, 6));
Assert.Equal (5, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (sub, result [1]);
Assert.Equal (sub.Margin, result [2]);
Assert.Equal (sub.Margin!.SubViews.ElementAt (0), result [3]);
Assert.Equal (sub.Margin!.SubViews.ElementAt (1), result [4]);
}
[Fact]
public void ReturnsRootAndSubviewAndBorderAndButton_WhenPointInsideSubviewBorder ()
{
TestView root = new (0, 0, 10, 10);
TestView sub = new (2, 2, 5, 5);
sub.Border!.Thickness = new (1);
Button closeButton = new Button ()
{
NoDecorations = true,
NoPadding = true,
Title = "X",
Width = 1,
Height = 1,
X = Pos.AnchorEnd (),
Y= 0,
ShadowStyle = ShadowStyle.None
};
sub.Border!.Add (closeButton);
root.Add (sub);
root.Layout ();
var result = View.GetViewsAtLocation (root, new Point (6, 2));
Assert.Equal (4, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (sub, result [1]);
Assert.Equal (sub.Border, result [2]);
Assert.Equal (closeButton, result [3]);
}
[Fact]
public void ReturnsDeepestSubview_WhenNested ()
{
TestView root = new (0, 0, 20, 20);
var sub1 = new TestView (2, 2, 16, 16);
var sub2 = new TestView (3, 3, 10, 10);
var sub3 = new TestView (1, 1, 5, 5);
root.Add (sub1);
sub1.Add (sub2);
sub2.Add (sub3);
// Point inside all
var result = View.GetViewsAtLocation (root, new Point (7, 7));
Assert.Equal (4, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (sub1, result [1]);
Assert.Equal (sub2, result [2]);
Assert.Equal (sub3, result [3]);
}
[Fact]
public void ReturnsTopmostSubview_WhenOverlapping ()
{
TestView root = new (0, 0, 10, 10);
var sub1 = new TestView (2, 2, 6, 6);
var sub2 = new TestView (4, 4, 6, 6);
root.Add (sub1);
root.Add (sub2); // sub2 is on top
var result = View.GetViewsAtLocation (root, new Point (5, 5));
Assert.Equal (3, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (sub1, result [1]);
Assert.Equal (sub2, result [2]);
}
[Fact]
public void ReturnsTopmostSubview_WhenNotOverlapping ()
{
TestView root = new (0, 0, 10, 10);// under 5,5,
var sub1 = new TestView (10, 10, 6, 6); // not under location 5,5
var sub2 = new TestView (4, 4, 6, 6); // under 5,5,
root.Add (sub1);
root.Add (sub2); // sub2 is on top
var result = View.GetViewsAtLocation (root, new Point (5, 5));
Assert.Equal (2, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (sub2, result [1]);
}
[Fact]
public void SkipsInvisibleSubviews ()
{
TestView root = new (0, 0, 10, 10);
var sub1 = new TestView (2, 2, 6, 6, visible: false);
var sub2 = new TestView (4, 4, 6, 6);
root.Add (sub1);
root.Add (sub2);
var result = View.GetViewsAtLocation (root, new Point (5, 5));
Assert.Equal (2, result.Count);
Assert.Equal (root, result [0]);
Assert.Equal (sub2, result [1]);
}
[Fact]
public void ReturnsRoot_WhenPointOnEdge ()
{
TestView root = new (0, 0, 10, 10);
var result = View.GetViewsAtLocation (root, new Point (0, 0));
Assert.Single (result);
Assert.Equal (root, result [0]);
}
[Fact]
public void ReturnsRoot_WhenPointOnBottomRightCorner ()
{
TestView root = new (0, 0, 10, 10);
var result = View.GetViewsAtLocation (root, new Point (9, 9));
Assert.Single (result);
Assert.Equal (root, result [0]);
}
[Fact]
public void ReturnsEmpty_WhenAllSubviewsInvisible ()
{
TestView root = new (0, 0, 10, 10);
var sub1 = new TestView (2, 2, 6, 6, visible: false);
root.Add (sub1);
var result = View.GetViewsAtLocation (root, new Point (3, 3));
Assert.Single (result);
Assert.Equal (root, result [0]);
}
}

View File

@@ -0,0 +1,334 @@
#nullable enable
namespace Terminal.Gui.ViewMouseTests;
[Trait ("Category", "Input")]
public class GetViewsUnderLocationForRootTests
{
[Fact]
public void ReturnsRoot_WhenPointInsideRoot_NoSubviews ()
{
Toplevel top = new ()
{
Frame = new (0, 0, 10, 10)
};
List<View?> result = View.GetViewsUnderLocation (top, new (5, 5), ViewportSettings.TransparentMouse);
Assert.Contains (top, result);
}
[Fact]
public void ReturnsEmpty_WhenPointOutsideRoot ()
{
Toplevel top = new ()
{
Frame = new (0, 0, 10, 10)
};
List<View?> result = View.GetViewsUnderLocation (top, new (20, 20), ViewportSettings.TransparentMouse);
Assert.Empty (result);
}
[Fact]
public void ReturnsSubview_WhenPointInsideSubview ()
{
Toplevel top = new ()
{
Frame = new (0, 0, 10, 10)
};
View sub = new ()
{
X = 2, Y = 2, Width = 5, Height = 5
};
top.Add (sub);
List<View?> result = View.GetViewsUnderLocation (top, new (3, 3), ViewportSettings.TransparentMouse);
Assert.Contains (top, result);
Assert.Contains (sub, result);
Assert.Equal (sub, result.Last ());
}
[Fact]
public void ReturnsTop_WhenPointInsideSubview_With_TransparentMouse ()
{
Toplevel top = new ()
{
Frame = new (0, 0, 10, 10)
};
View sub = new ()
{
X = 2, Y = 2, Width = 5, Height = 5,
ViewportSettings = ViewportSettings.TransparentMouse
};
top.Add (sub);
List<View?> result = View.GetViewsUnderLocation (top, new (3, 3), ViewportSettings.TransparentMouse);
Assert.Single (result);
Assert.Contains (top, result);
result = View.GetViewsUnderLocation (top, new (3, 3), ViewportSettings.None);
Assert.Equal (2, result.Count);
Assert.Contains (top, result);
Assert.Contains (sub, result);
}
[Fact]
public void ReturnsAdornment_WhenPointInMargin ()
{
Toplevel top = new ()
{
Frame = new (0, 0, 10, 10)
};
top.Margin!.Thickness = new (1);
top.Margin!.ViewportSettings = ViewportSettings.None;
List<View?> result = View.GetViewsUnderLocation (top, new (0, 0), ViewportSettings.TransparentMouse);
Assert.Contains (top, result);
Assert.Contains (top.Margin, result);
}
[Fact]
public void Returns_WhenPointIn_TransparentToMouseMargin_None ()
{
Toplevel top = new ()
{
Frame = new (0, 0, 10, 10)
};
top.Margin!.Thickness = new (1);
top.Margin!.ViewportSettings = ViewportSettings.TransparentMouse;
List<View?> result = View.GetViewsUnderLocation (top, new (0, 0), ViewportSettings.TransparentMouse);
Assert.DoesNotContain (top, result);
Assert.DoesNotContain (top.Margin, result);
}
[Fact]
public void Returns_WhenPointIn_NotTransparentToMouseMargin_Top_And_Margin ()
{
Toplevel top = new ()
{
Frame = new (0, 0, 10, 10)
};
top.Margin!.Thickness = new (1);
top.Margin!.ViewportSettings = ViewportSettings.None;
List<View?> result = View.GetViewsUnderLocation (top, new (0, 0), ViewportSettings.TransparentMouse);
Assert.Contains (top, result);
Assert.Contains (top.Margin, result);
}
[Fact]
public void ReturnsAdornment_WhenPointInBorder ()
{
Toplevel top = new ()
{
Frame = new (0, 0, 10, 10)
};
top.Border!.Thickness = new (1);
List<View?> result = View.GetViewsUnderLocation (top, new (0, 0), ViewportSettings.TransparentMouse);
Assert.Contains (top, result);
Assert.Contains (top.Border, result);
}
[Fact]
public void ReturnsAdornment_WhenPointInPadding ()
{
Toplevel top = new ()
{
Frame = new (0, 0, 10, 10)
};
top.Border!.Thickness = new (1);
top.Padding!.Thickness = new (1);
top.Layout ();
List<View?> result = View.GetViewsUnderLocation (top, new (1, 1), ViewportSettings.TransparentMouse);
Assert.Contains (top, result);
Assert.Contains (top.Padding, result);
}
[Fact]
public void HonorsIgnoreTransparentMouseParam ()
{
Toplevel top = new ()
{
Frame = new (0, 0, 10, 10),
ViewportSettings = ViewportSettings.TransparentMouse
};
List<View?> result = View.GetViewsUnderLocation (top, new (5, 5), ViewportSettings.TransparentMouse);
Assert.Empty (result);
result = View.GetViewsUnderLocation (top, new (5, 5), ViewportSettings.None);
Assert.NotEmpty (result);
}
[Fact]
public void ReturnsDeepestSubview_WhenNested ()
{
Toplevel top = new ()
{
Frame = new (0, 0, 10, 10)
};
View sub1 = new ()
{
X = 1, Y = 1, Width = 8, Height = 8
};
View sub2 = new ()
{
X = 1, Y = 1, Width = 6, Height = 6
};
sub1.Add (sub2);
top.Add (sub1);
List<View?> result = View.GetViewsUnderLocation (top, new (3, 3), ViewportSettings.TransparentMouse);
Assert.Contains (sub2, result);
Assert.Equal (sub2, result.Last ());
}
[Fact]
public void Returns_Subview_WhenPointIn_TransparentToMouseMargin_Top ()
{
Toplevel top = new ()
{
Frame = new (0, 0, 20, 20)
};
View subView = new ()
{
Frame = new (0, 0, 5, 5)
};
subView.Margin!.Thickness = new (1);
subView.Margin!.ViewportSettings = ViewportSettings.None;
top.Add (subView);
Assert.True (subView.Contains (new Point (4, 4)));
List<View?> result = View.GetViewsUnderLocation (top, new (4, 4), ViewportSettings.TransparentMouse);
Assert.Contains (top, result);
Assert.Contains (subView.Margin, result);
Assert.Contains (subView, result);
subView.Margin!.ViewportSettings = ViewportSettings.TransparentMouse;
result = View.GetViewsUnderLocation (top, new (4, 4), ViewportSettings.TransparentMouse);
Assert.Contains (top, result);
Assert.DoesNotContain (subView.Margin, result);
Assert.DoesNotContain (subView, result);
}
[Theory]
[InlineData ("Margin")]
[InlineData ("Border")]
[InlineData ("Padding")]
public void Returns_Subview_Of_Adornment (string adornmentType)
{
// Arrange: top -> subView -> subView.[Adornment] -> adornmentSubView
Toplevel top = new ()
{
Frame = new (0, 0, 10, 10)
};
View subView = new ()
{
X = 0, Y = 0, Width = 8, Height = 8
};
top.Add (subView);
View? adornment = null;
switch (adornmentType)
{
case "Margin":
subView.Margin!.Thickness = new (2);
adornment = subView.Margin;
break;
case "Border":
subView.Border!.Thickness = new (2);
adornment = subView.Border;
break;
case "Padding":
subView.Padding!.Thickness = new (2);
adornment = subView.Padding;
break;
}
subView.Layout ();
// Add a child to the adornment
View adornmentSubView = new ()
{
X = 0, Y = 0, Width = 2, Height = 2
};
adornment!.Add (adornmentSubView);
// Set adornment ViewportSettings to None so it doesn't interfere with the test
adornment.ViewportSettings = ViewportSettings.None;
// Act: Point inside adornmentSubView (which is inside the adornment)
var result = View.GetViewsUnderLocation (top, new (0, 0), ViewportSettings.TransparentMouse);
// Assert: Should contain top, subView, adornment, and adornmentSubView
Assert.Contains (top, result);
Assert.Contains (subView, result);
Assert.Contains (adornment, result);
Assert.Contains (adornmentSubView, result);
Assert.Equal (top, result [0]);
Assert.Equal (adornmentSubView, result [^1]);
}
[Theory]
[InlineData ("Margin")]
[InlineData ("Border")]
[InlineData ("Padding")]
public void Returns_OnlyParentsSuperView_Of_Adornment_If_TransparentMouse (string adornmentType)
{
// Arrange: top -> subView -> subView.[Adornment] -> adornmentSubView
Toplevel top = new ()
{
Id = "top",
Frame = new (0, 0, 10, 10)
};
View subView = new ()
{
Id = "subView",
X = 0, Y = 0, Width = 8, Height = 8
};
top.Add (subView);
View? adornment = null;
switch (adornmentType)
{
case "Margin":
subView.Margin!.Thickness = new (2);
adornment = subView.Margin;
break;
case "Border":
subView.Border!.Thickness = new (2);
adornment = subView.Border;
break;
case "Padding":
subView.Padding!.Thickness = new (2);
adornment = subView.Padding;
break;
}
subView.Layout ();
// Add a child to the adornment
View adornmentSubView = new ()
{
Id = "adornmentSubView",
X = 0, Y = 0, Width = 2, Height = 2
};
adornment!.Add (adornmentSubView);
adornment.ViewportSettings = ViewportSettings.TransparentMouse;
// Act: Point inside adornmentSubView (which is inside the adornment)
var result = View.GetViewsUnderLocation (top, new (0, 0), ViewportSettings.TransparentMouse);
// Assert: Should contain top, subView, adornment, and adornmentSubView
Assert.Contains (top, result);
Assert.DoesNotContain (adornment, result);
Assert.Contains (adornmentSubView, result);
Assert.DoesNotContain (subView, result);
Assert.Equal (top, result [0]);
Assert.Equal (adornmentSubView, result [^1]);
}
}

View File

@@ -3,13 +3,13 @@
namespace Terminal.Gui.ViewMouseTests;
[Trait ("Category", "Input")]
public class GetViewsUnderMouseTests
public class GetViewsUnderLocationTests
{
[Theory]
[InlineData (0, 0)]
[InlineData (2, 1)]
[InlineData (20, 20)]
public void GetViewsUnderMouse_Returns_Null_If_No_SubViews_Coords_Outside (int testX, int testY)
public void Returns_Null_If_No_SubViews_Coords_Outside (int testX, int testY)
{
// Arrange
var view = new View
@@ -20,7 +20,7 @@ public class GetViewsUnderMouseTests
var location = new Point (testX, testY);
// Act
List<View?> viewsUnderMouse = View.GetViewsUnderMouse (location);
List<View?> viewsUnderMouse = View.GetViewsUnderLocation (location, ViewportSettings.None);
// Assert
Assert.Empty (viewsUnderMouse);
@@ -30,7 +30,7 @@ public class GetViewsUnderMouseTests
[InlineData (0, 0)]
[InlineData (2, 1)]
[InlineData (20, 20)]
public void GetViewsUnderMouse_Returns_Null_If_Start_Not_Visible (int testX, int testY)
public void Returns_Null_If_Start_Not_Visible (int testX, int testY)
{
// Arrange
var view = new View
@@ -42,7 +42,7 @@ public class GetViewsUnderMouseTests
var location = new Point (testX, testY);
// Act
List<View?> viewsUnderMouse = View.GetViewsUnderMouse (location);
List<View?> viewsUnderMouse = View.GetViewsUnderLocation (location, ViewportSettings.None);
// Assert
Assert.Empty (viewsUnderMouse);

View File

@@ -474,97 +474,4 @@ public class ViewportTests (ITestOutputHelper output)
Assert.Equal (2, view.ViewportChangedEventCallCount);
}
//[Theory]
//[InlineData (0, 0, true)]
//[InlineData (-1, 0, true)]
//[InlineData (0, -1, true)]
//[InlineData (-1, -1, true)]
//[InlineData (-2, -2, true)]
//[InlineData (-3, -3, true)]
//[InlineData (-4, -4, true)]
//[InlineData (-5, -4, false)]
//[InlineData (-4, -5, false)]
//[InlineData (-5, -5, false)]
//[InlineData (1, 1, true)]
//[InlineData (2, 2, true)]
//[InlineData (3, 3, true)]
//[InlineData (4, 4, true)]
//[InlineData (5, 4, false)]
//[InlineData (4, 5, false)]
//[InlineData (5, 5, false)]
//public void IsVisibleInSuperView_No_Driver_No_SuperView (int x, int y, bool expected)
//{
// var view = new View { X = 1, Y = 1, Width = 5, Height = 5 };
// Assert.True (view.IsVisibleInSuperView (x, y) == expected);
//}
//[Theory]
//[InlineData (0, 0, true)]
//[InlineData (-1, 0, true)]
//[InlineData (0, -1, true)]
//[InlineData (-1, -1, true)]
//[InlineData (-2, -2, true)]
//[InlineData (-3, -3, true)]
//[InlineData (-4, -4, true)]
//[InlineData (-5, -4, true)]
//[InlineData (-4, -5, true)]
//[InlineData (-5, -5, true)]
//[InlineData (-6, -5, false)]
//[InlineData (-5, -6, false)]
//[InlineData (-6, -6, false)]
//[InlineData (1, 1, true)]
//[InlineData (2, 2, true)]
//[InlineData (3, 3, true)]
//[InlineData (4, 4, true)]
//[InlineData (5, 4, true)]
//[InlineData (4, 5, true)]
//[InlineData (5, 5, true)]
//[InlineData (6, 5, true)]
//[InlineData (6, 6, true)]
//[InlineData (7, 7, true)]
//[InlineData (8, 8, true)]
//[InlineData (9, 8, false)]
//[InlineData (8, 9, false)]
//[InlineData (9, 9, false)]
//public void IsVisibleInSuperView_No_Driver_With_SuperView (int x, int y, bool expected)
//{
// var view = new View { X = 1, Y = 1, Width = 5, Height = 5 };
// var top = new Toplevel { Width = 10, Height = 10 };
// top.Add (view);
// Assert.True (view.IsVisibleInSuperView (x, y) == expected);
//}
//[SetupFakeDriver]
//[Theory]
//[InlineData (0, 0, true)]
//[InlineData (-1, 0, false)]
//[InlineData (0, -1, false)]
//[InlineData (-1, -1, false)]
//[InlineData (1, 0, true)]
//[InlineData (0, 1, true)]
//[InlineData (1, 1, true)]
//[InlineData (2, 2, true)]
//[InlineData (3, 3, true)]
//[InlineData (4, 4, true)]
//[InlineData (5, 4, false)]
//[InlineData (4, 5, false)]
//[InlineData (5, 5, false)]
//public void IsVisibleInSuperView_With_Driver (int x, int y, bool expected)
//{
// ((FakeDriver)Application.Driver!).SetBufferSize (10, 10);
// var view = new View { X = 1, Y = 1, Width = 5, Height = 5 };
// var top = new Toplevel ();
// top.Add (view);
// Application.Begin (top);
// Assert.True (view.IsVisibleInSuperView (x, y) == expected);
// top.Dispose ();
// Application.Shutdown ();
//}
}

View File

@@ -0,0 +1,267 @@
#nullable enable
using Terminal.Gui;
using Xunit;
namespace Terminal.Gui.ViewTests;
[Trait ("Category", "View.Scheme")]
public class SchemeTests
{
[Fact]
public void GetScheme_Default_ReturnsBaseScheme ()
{
var view = new View ();
var baseScheme = SchemeManager.GetHardCodedSchemes ()? ["Base"];
Assert.Equal (baseScheme, view.GetScheme ());
view.Dispose ();
}
[Fact]
public void SetScheme_Explicitly_SetsSchemeCorrectly ()
{
var view = new View ();
var dialogScheme = SchemeManager.GetHardCodedSchemes ()? ["Dialog"];
view.SetScheme (dialogScheme);
Assert.True (view.HasScheme);
Assert.Equal (dialogScheme, view.GetScheme ());
view.Dispose ();
}
[Fact]
public void GetScheme_InheritsFromSuperView_WhenNotExplicitlySet ()
{
var superView = new View ();
var subView = new View ();
superView.Add (subView);
var dialogScheme = SchemeManager.GetHardCodedSchemes ()? ["Dialog"];
superView.SetScheme (dialogScheme);
Assert.Equal (dialogScheme, subView.GetScheme ());
Assert.False (subView.HasScheme);
subView.Dispose ();
superView.Dispose ();
}
[Fact]
public void SetSchemeName_OverridesInheritedScheme ()
{
var view = new View ();
view.SchemeName = "Dialog";
var dialogScheme = SchemeManager.GetHardCodedSchemes ()? ["Dialog"];
Assert.Equal (dialogScheme, view.GetScheme ());
view.Dispose ();
}
[Fact]
public void GetAttribute_ReturnsCorrectAttribute_Via_Mock ()
{
var view = new View { SchemeName = "Base" };
view.Driver = new MockConsoleDriver ();
view.Driver.SetAttribute (new Attribute (Color.Red, Color.Green));
// Act
var attribute = view.GetCurrentAttribute ();
// Assert
Assert.Equal (new Attribute (Color.Red, Color.Green), attribute);
}
[Fact]
public void GetAttributeForRole_ReturnsCorrectAttribute ()
{
var view = new View { SchemeName = "Base" };
Assert.Equal (view.GetScheme ().Normal, view.GetAttributeForRole (VisualRole.Normal));
Assert.Equal (view.GetScheme ().HotNormal, view.GetAttributeForRole (VisualRole.HotNormal));
Assert.Equal (view.GetScheme ().Focus, view.GetAttributeForRole (VisualRole.Focus));
Assert.Equal (view.GetScheme ().HotFocus, view.GetAttributeForRole (VisualRole.HotFocus));
Assert.Equal (view.GetScheme ().Disabled, view.GetAttributeForRole (VisualRole.Disabled));
view.Dispose ();
}
[Fact]
public void GetAttributeForRole_DisabledView_ReturnsCorrectAttribute ()
{
var view = new View { SchemeName = "Base" };
view.Enabled = false;
Assert.Equal (view.GetScheme ().Disabled, view.GetAttributeForRole (VisualRole.Normal));
Assert.Equal (view.GetScheme ().Disabled, view.GetAttributeForRole (VisualRole.HotNormal));
view.Dispose ();
}
[Fact]
public void SetAttributeForRole_SetsCorrectAttribute ()
{
var view = new View { SchemeName = "Base" };
view.Driver = new MockConsoleDriver ();
view.Driver.SetAttribute (new Attribute (Color.Red, Color.Green));
var previousAttribute = view.SetAttributeForRole (VisualRole.Focus);
Assert.Equal (view.GetScheme ().Focus, view.GetCurrentAttribute ());
Assert.NotEqual (previousAttribute, view.GetCurrentAttribute ());
view.Dispose ();
}
[Fact]
public void OnGettingScheme_Override_StopsDefaultBehavior ()
{
var view = new CustomView ();
var customScheme = SchemeManager.GetHardCodedSchemes ()? ["Error"];
Assert.Equal (customScheme, view.GetScheme ());
view.Dispose ();
}
[Fact]
public void OnSettingScheme_Override_PreventsSettingScheme ()
{
var view = new CustomView ();
var dialogScheme = SchemeManager.GetHardCodedSchemes ()? ["Dialog"];
view.SetScheme (dialogScheme);
Assert.NotEqual (dialogScheme, view.GetScheme ());
view.Dispose ();
}
[Fact]
public void GettingScheme_Event_CanOverrideScheme ()
{
var view = new View ();
var customScheme = SchemeManager.GetHardCodedSchemes ()? ["Error"];
view.GettingScheme += (sender, args) =>
{
args.NewScheme = customScheme;
args.Cancel = true;
};
Assert.Equal (customScheme, view.GetScheme ());
view.Dispose ();
}
[Fact]
public void SettingScheme_Event_CanCancelSchemeChange ()
{
var view = new View ();
var dialogScheme = SchemeManager.GetHardCodedSchemes ()? ["Dialog"];
view.SettingScheme += (sender, args) => args.Cancel = true;
view.SetScheme (dialogScheme);
Assert.NotEqual (dialogScheme, view.GetScheme ());
view.Dispose ();
}
[Fact]
public void GetAttributeForRole_Event_CanOverrideAttribute ()
{
var view = new View { SchemeName = "Base" };
var customAttribute = new Attribute (Color.BrightRed, Color.BrightYellow);
view.GettingAttributeForRole += (sender, args) =>
{
if (args.Role == VisualRole.Focus)
{
args.NewValue = customAttribute;
args.Cancel = true;
}
};
Assert.Equal (customAttribute, view.GetAttributeForRole (VisualRole.Focus));
view.Dispose ();
}
[Fact]
public void GetHardCodedSchemes_ReturnsExpectedSchemes ()
{
var schemes = Scheme.GetHardCodedSchemes ();
Assert.NotNull (schemes);
Assert.Contains ("Base", schemes.Keys);
Assert.Contains ("Dialog", schemes.Keys);
Assert.Contains ("Error", schemes.Keys);
Assert.Contains ("Menu", schemes.Keys);
Assert.Contains ("Toplevel", schemes.Keys);
}
[Fact]
public void SchemeName_OverridesSuperViewScheme ()
{
var superView = new View ();
var subView = new View ();
superView.Add (subView);
subView.SchemeName = "Error";
var errorScheme = SchemeManager.GetHardCodedSchemes ()? ["Error"];
Assert.Equal (errorScheme, subView.GetScheme());
subView.Dispose ();
superView.Dispose ();
}
[Fact]
public void Scheme_DefaultsToBase_WhenNotSet ()
{
var view = new View ();
var baseScheme = SchemeManager.GetHardCodedSchemes ()? ["Base"];
Assert.Equal (baseScheme, view.GetScheme());
view.Dispose ();
}
[Fact]
public void Scheme_HandlesNullSuperViewGracefully ()
{
var view = new View ();
view.SchemeName = "Dialog";
var dialogScheme = SchemeManager.GetHardCodedSchemes ()? ["Dialog"];
Assert.Equal (dialogScheme, view.GetScheme());
view.Dispose ();
}
private class CustomView : View
{
protected override bool OnGettingScheme (out Scheme? scheme)
{
scheme = SchemeManager.GetHardCodedSchemes ()? ["Error"];
return true;
}
protected override bool OnSettingScheme (in Scheme? scheme)
{
return true; // Prevent setting the scheme
}
}
[Fact]
public void View_Resolves_Attributes_From_Scheme ()
{
View view = new Label { SchemeName = "Base" };
foreach (VisualRole role in Enum.GetValues<VisualRole> ())
{
Attribute attr = view.GetAttributeForRole (role);
Assert.NotEqual (default, attr.Foreground); // Defensive: avoid all-defaults
}
view.Dispose ();
}
}