mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2026-01-01 16:59:35 +01:00
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
@@ -35,7 +35,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
Assert.Equal (new (0, 0, 0, 2), cb.Frame);
|
||||
Assert.Equal (-1, cb.SelectedItem);
|
||||
|
||||
cb = new() { Text = "Test" };
|
||||
cb = new () { Text = "Test" };
|
||||
cb.BeginInit ();
|
||||
cb.EndInit ();
|
||||
cb.LayoutSubViews ();
|
||||
@@ -44,7 +44,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
Assert.Equal (new (0, 0, 0, 2), cb.Frame);
|
||||
Assert.Equal (-1, cb.SelectedItem);
|
||||
|
||||
cb = new()
|
||||
cb = new ()
|
||||
{
|
||||
X = 1,
|
||||
Y = 2,
|
||||
@@ -60,7 +60,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
Assert.Equal (new (1, 2, 10, 20), cb.Frame);
|
||||
Assert.Equal (-1, cb.SelectedItem);
|
||||
|
||||
cb = new() { Source = new ListWrapper<string> (["One", "Two", "Three"]) };
|
||||
cb = new () { Source = new ListWrapper<string> (["One", "Two", "Three"]) };
|
||||
cb.BeginInit ();
|
||||
cb.EndInit ();
|
||||
cb.LayoutSubViews ();
|
||||
@@ -138,7 +138,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
Assert.Equal (-1, cb.SelectedItem);
|
||||
Assert.Equal ("", cb.Text);
|
||||
|
||||
Assert.True (cb.NewMouseEvent (new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }));
|
||||
Assert.True (cb.NewMouseEvent (new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }));
|
||||
Assert.Equal ("", selected);
|
||||
Assert.True (cb.IsShow);
|
||||
Assert.Equal (0, cb.SelectedItem);
|
||||
@@ -194,7 +194,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
|
||||
Assert.True (
|
||||
cb.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -232,7 +232,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
|
||||
Assert.True (
|
||||
cb.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -290,7 +290,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
|
||||
Assert.True (
|
||||
cb.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -303,7 +303,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
Assert.True (
|
||||
cb.SubViews.ElementAt (1)
|
||||
.NewMouseEvent (
|
||||
new() { Position = new (0, 1), Flags = MouseFlags.Button1Clicked }
|
||||
new () { Position = new (0, 1), Flags = MouseFlags.Button1Clicked }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -314,7 +314,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
Assert.True (
|
||||
cb.SubViews.ElementAt (1)
|
||||
.NewMouseEvent (
|
||||
new() { Position = new (0, 1), Flags = MouseFlags.Button1Clicked }
|
||||
new () { Position = new (0, 1), Flags = MouseFlags.Button1Clicked }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -327,7 +327,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
Assert.True (
|
||||
cb.SubViews.ElementAt (1)
|
||||
.NewMouseEvent (
|
||||
new() { Position = new (0, 2), Flags = MouseFlags.Button1Clicked }
|
||||
new () { Position = new (0, 2), Flags = MouseFlags.Button1Clicked }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("Three", selected);
|
||||
@@ -337,14 +337,14 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
|
||||
Assert.True (
|
||||
cb.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
)
|
||||
);
|
||||
|
||||
Assert.True (
|
||||
cb.SubViews.ElementAt (1)
|
||||
.NewMouseEvent (
|
||||
new() { Position = new (0, 2), Flags = MouseFlags.Button1Clicked }
|
||||
new () { Position = new (0, 2), Flags = MouseFlags.Button1Clicked }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("Three", selected);
|
||||
@@ -354,7 +354,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
|
||||
Assert.True (
|
||||
cb.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("Three", selected);
|
||||
@@ -365,7 +365,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
Assert.True (
|
||||
cb.SubViews.ElementAt (1)
|
||||
.NewMouseEvent (
|
||||
new() { Position = new (0, 0), Flags = MouseFlags.Button1Clicked }
|
||||
new () { Position = new (0, 0), Flags = MouseFlags.Button1Clicked }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("One", selected);
|
||||
@@ -394,14 +394,14 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
|
||||
Assert.True (
|
||||
cb.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
)
|
||||
);
|
||||
|
||||
Assert.True (
|
||||
cb.SubViews.ElementAt (1)
|
||||
.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -412,7 +412,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
Assert.True (
|
||||
cb.SubViews.ElementAt (1)
|
||||
.NewMouseEvent (
|
||||
new() { Position = new (-1, 0), Flags = MouseFlags.Button1Clicked }
|
||||
new () { Position = new (-1, 0), Flags = MouseFlags.Button1Clicked }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -425,7 +425,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
Assert.True (
|
||||
cb.SubViews.ElementAt (1)
|
||||
.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -436,7 +436,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
Assert.True (
|
||||
cb.SubViews.ElementAt (1)
|
||||
.NewMouseEvent (
|
||||
new() { Position = new (0, -1), Flags = MouseFlags.Button1Clicked }
|
||||
new () { Position = new (0, -1), Flags = MouseFlags.Button1Clicked }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -449,7 +449,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
Assert.True (
|
||||
cb.SubViews.ElementAt (1)
|
||||
.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -460,7 +460,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
Assert.True (
|
||||
cb.SubViews.ElementAt (1)
|
||||
.NewMouseEvent (
|
||||
new() { Position = new (cb.Frame.Width, 0), Flags = MouseFlags.Button1Clicked }
|
||||
new () { Position = new (cb.Frame.Width, 0), Flags = MouseFlags.Button1Clicked }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -473,7 +473,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
Assert.True (
|
||||
cb.SubViews.ElementAt (1)
|
||||
.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Clicked }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -484,7 +484,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
Assert.True (
|
||||
cb.SubViews.ElementAt (1)
|
||||
.NewMouseEvent (
|
||||
new() { Position = new (0, cb.Frame.Height), Flags = MouseFlags.Button1Clicked }
|
||||
new () { Position = new (0, cb.Frame.Height), Flags = MouseFlags.Button1Clicked }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -495,7 +495,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
}
|
||||
|
||||
[Fact]
|
||||
[AutoInitShutdown (configLocation: ConfigLocations.Default)]
|
||||
[AutoInitShutdown]
|
||||
public void HideDropdownListOnClick_True_Highlight_Current_Item ()
|
||||
{
|
||||
var selected = "";
|
||||
@@ -518,7 +518,7 @@ public class ComboBoxTests (ITestOutputHelper output)
|
||||
|
||||
Assert.True (
|
||||
cb.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -542,13 +542,13 @@ Three ",
|
||||
Attribute [] attributes =
|
||||
{
|
||||
// 0
|
||||
cb.SubViews.ElementAt (0).ColorScheme.Focus,
|
||||
cb.SubViews.ElementAt (0).GetAttributeForRole(VisualRole.Focus),
|
||||
|
||||
// 1
|
||||
cb.SubViews.ElementAt (1).ColorScheme.HotFocus,
|
||||
cb.SubViews.ElementAt(1).GetAttributeForRole(VisualRole.HotFocus),
|
||||
|
||||
// 2
|
||||
cb.SubViews.ElementAt (1).GetNormalColor ()
|
||||
cb.SubViews.ElementAt(1).GetAttributeForRole(VisualRole.Normal)
|
||||
};
|
||||
|
||||
DriverAssert.AssertDriverAttributesAre (
|
||||
@@ -690,7 +690,7 @@ Three ",
|
||||
|
||||
Assert.True (
|
||||
cb.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -702,7 +702,7 @@ Three ",
|
||||
|
||||
Assert.True (
|
||||
cb.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -712,7 +712,7 @@ Three ",
|
||||
|
||||
Assert.True (
|
||||
cb.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -724,7 +724,7 @@ Three ",
|
||||
|
||||
Assert.True (
|
||||
cb.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -753,7 +753,7 @@ Three ",
|
||||
|
||||
Assert.True (
|
||||
cb.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
@@ -811,7 +811,7 @@ Three ",
|
||||
|
||||
Assert.True (
|
||||
cb.NewMouseEvent (
|
||||
new() { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
new () { Position = new (cb.Viewport.Right - 1, 0), Flags = MouseFlags.Button1Pressed }
|
||||
)
|
||||
);
|
||||
Assert.Equal ("", selected);
|
||||
|
||||
Reference in New Issue
Block a user