mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-26 15:57:56 +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
@@ -19,15 +19,15 @@ public class BorderTests (ITestOutputHelper output)
|
||||
view.Border!.Thickness = new (0, 1, 0, 0);
|
||||
view.Border.LineStyle = LineStyle.Single;
|
||||
|
||||
view.ColorScheme = new ()
|
||||
view.SetScheme (new ()
|
||||
{
|
||||
Normal = new (Color.Red, Color.Green),
|
||||
Focus = new (Color.Green, Color.Red)
|
||||
};
|
||||
Assert.NotEqual (view.ColorScheme.Normal.Foreground, view.ColorScheme.Focus.Foreground);
|
||||
Assert.Equal (ColorName16.Red, view.Border.GetNormalColor ().Foreground.GetClosestNamedColor16 ());
|
||||
Assert.Equal (ColorName16.Green, view.Border.GetFocusColor ().Foreground.GetClosestNamedColor16 ());
|
||||
Assert.Equal (view.GetFocusColor (), view.Border.GetFocusColor ());
|
||||
});
|
||||
Assert.NotEqual (view.GetScheme ().Normal.Foreground, view.GetScheme ().Focus.Foreground);
|
||||
Assert.Equal (ColorName16.Red, view.Border.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ());
|
||||
Assert.Equal (ColorName16.Green, view.Border.GetAttributeForRole (VisualRole.Focus).Foreground.GetClosestNamedColor16 ());
|
||||
Assert.Equal (view.GetAttributeForRole (VisualRole.Focus), view.Border.GetAttributeForRole (VisualRole.Focus));
|
||||
|
||||
superView.BeginInit ();
|
||||
superView.EndInit ();
|
||||
@@ -35,34 +35,34 @@ public class BorderTests (ITestOutputHelper output)
|
||||
|
||||
var expected = @"─┤A├─";
|
||||
DriverAssert.AssertDriverContentsAre (expected, output);
|
||||
DriverAssert.AssertDriverAttributesAre ("00000", output, null, view.ColorScheme.Normal);
|
||||
DriverAssert.AssertDriverAttributesAre ("00000", output, null, view.GetScheme ().Normal);
|
||||
|
||||
view.CanFocus = true;
|
||||
view.SetFocus ();
|
||||
View.SetClipToScreen ();
|
||||
view.Draw ();
|
||||
Assert.Equal (view.GetFocusColor (), view.Border.GetFocusColor ());
|
||||
Assert.Equal (view.ColorScheme.Focus.Foreground, view.Border.GetFocusColor ().Foreground);
|
||||
Assert.Equal (view.ColorScheme.Normal.Foreground, view.Border.GetNormalColor ().Foreground);
|
||||
DriverAssert.AssertDriverAttributesAre ("00100", output, null, view.ColorScheme.Normal, view.GetFocusColor ());
|
||||
Assert.Equal (view.GetAttributeForRole (VisualRole.Focus), view.Border.GetAttributeForRole (VisualRole.Focus));
|
||||
Assert.Equal (view.GetScheme ().Focus.Foreground, view.Border.GetAttributeForRole (VisualRole.Focus).Foreground);
|
||||
Assert.Equal (view.GetScheme ().Normal.Foreground, view.Border.GetAttributeForRole (VisualRole.Normal).Foreground);
|
||||
DriverAssert.AssertDriverAttributesAre ("00100", output, null, view.GetScheme ().Normal, view.GetAttributeForRole (VisualRole.Focus));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
[SetupFakeDriver]
|
||||
public void Border_Uses_Parent_ColorScheme ()
|
||||
public void Border_Uses_Parent_Scheme ()
|
||||
{
|
||||
var view = new View { Title = "A", Height = 2, Width = 5 };
|
||||
view.Border.Thickness = new (0, 1, 0, 0);
|
||||
view.Border.LineStyle = LineStyle.Single;
|
||||
|
||||
view.ColorScheme = new ()
|
||||
view.SetScheme (new ()
|
||||
{
|
||||
Normal = new (Color.Red, Color.Green), Focus = new (Color.Green, Color.Red)
|
||||
};
|
||||
Assert.Equal (ColorName16.Red, view.Border.GetNormalColor ().Foreground.GetClosestNamedColor16 ());
|
||||
Assert.Equal (ColorName16.Green, view.Border.GetFocusColor ().Foreground.GetClosestNamedColor16 ());
|
||||
Assert.Equal (view.GetNormalColor (), view.Border.GetNormalColor ());
|
||||
Assert.Equal (view.GetFocusColor (), view.Border.GetFocusColor ());
|
||||
});
|
||||
Assert.Equal (ColorName16.Red, view.Border.GetAttributeForRole (VisualRole.Normal).Foreground.GetClosestNamedColor16 ());
|
||||
Assert.Equal (ColorName16.Green, view.Border.GetAttributeForRole (VisualRole.Focus).Foreground.GetClosestNamedColor16 ());
|
||||
Assert.Equal (view.GetAttributeForRole (VisualRole.Normal), view.Border.GetAttributeForRole (VisualRole.Normal));
|
||||
Assert.Equal (view.GetAttributeForRole (VisualRole.Focus), view.Border.GetAttributeForRole (VisualRole.Focus));
|
||||
|
||||
view.BeginInit ();
|
||||
view.EndInit ();
|
||||
@@ -70,7 +70,7 @@ public class BorderTests (ITestOutputHelper output)
|
||||
|
||||
var expected = @"─┤A├─";
|
||||
DriverAssert.AssertDriverContentsAre (expected, output);
|
||||
DriverAssert.AssertDriverAttributesAre ("00000", output, null, view.ColorScheme.Normal);
|
||||
DriverAssert.AssertDriverAttributesAre ("00000", output, null, view.GetScheme ().Normal);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
@@ -727,7 +727,7 @@ public class BorderTests (ITestOutputHelper output)
|
||||
var top = new Toplevel ();
|
||||
top.BorderStyle = LineStyle.Double;
|
||||
|
||||
var frame = new FrameView { Width = Dim.Fill (), Height = Dim.Fill () };
|
||||
var frame = new FrameView { Width = Dim.Fill (), Height = Dim.Fill (), BorderStyle = LineStyle.Single};
|
||||
|
||||
top.Add (frame);
|
||||
RunState rs = Application.Begin (top);
|
||||
@@ -755,7 +755,7 @@ public class BorderTests (ITestOutputHelper output)
|
||||
var top = new Toplevel ();
|
||||
top.BorderStyle = LineStyle.Double;
|
||||
|
||||
var frame = new FrameView { Title = "1234", Width = Dim.Fill (), Height = Dim.Fill () };
|
||||
var frame = new FrameView { Title = "1234", Width = Dim.Fill (), Height = Dim.Fill (), BorderStyle = LineStyle.Single };
|
||||
|
||||
top.Add (frame);
|
||||
RunState rs = Application.Begin (top);
|
||||
|
||||
Reference in New Issue
Block a user