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
GitHub
@@ -1,4 +1,5 @@
|
||||
using UnitTests;
|
||||
using System.Collections.Concurrent;
|
||||
using UnitTests;
|
||||
using static Terminal.Gui.ConfigurationManager;
|
||||
|
||||
namespace Terminal.Gui.ConfigurationTests;
|
||||
@@ -6,42 +7,111 @@ namespace Terminal.Gui.ConfigurationTests;
|
||||
public class SettingsScopeTests
|
||||
{
|
||||
[Fact]
|
||||
public void Update_Overrides_Defaults ()
|
||||
public void Load_Overrides_Defaults ()
|
||||
{
|
||||
// arrange
|
||||
Locations = ConfigLocations.Default;
|
||||
Load (true);
|
||||
Enable (ConfigLocations.HardCoded);
|
||||
|
||||
Assert.Equal (Key.Esc, (Key)Settings ["Application.QuitKey"].PropertyValue);
|
||||
Assert.Equal (Key.Esc, (Key)Settings! ["Application.QuitKey"].PropertyValue);
|
||||
|
||||
ThrowOnJsonErrors = true;
|
||||
|
||||
// act
|
||||
var json = """
|
||||
RuntimeConfig = """
|
||||
|
||||
{
|
||||
"Application.QuitKey": "Ctrl-Q"
|
||||
}
|
||||
""";
|
||||
|
||||
Settings!.Update (json, "test", ConfigLocations.Runtime);
|
||||
Load (ConfigLocations.Runtime);
|
||||
|
||||
// assert
|
||||
Assert.Equal (Key.Q.WithCtrl, (Key)Settings ["Application.QuitKey"].PropertyValue);
|
||||
|
||||
// clean up
|
||||
Locations = ConfigLocations.All;
|
||||
Reset ();
|
||||
Disable (resetToHardCodedDefaults: true);
|
||||
|
||||
}
|
||||
|
||||
|
||||
[Fact]
|
||||
public void Load_Dictionary_Property_Overrides_Defaults ()
|
||||
{
|
||||
// arrange
|
||||
Enable (ConfigLocations.HardCoded);
|
||||
ThrowOnJsonErrors = true;
|
||||
|
||||
ConfigProperty themesConfigProperty = Settings! ["Themes"];
|
||||
ConcurrentDictionary<string, ThemeScope> dict = themesConfigProperty.PropertyValue as ConcurrentDictionary<string, ThemeScope>;
|
||||
|
||||
Assert.NotNull (dict);
|
||||
Assert.Single (dict);
|
||||
Assert.NotEmpty ((ConcurrentDictionary<string, ThemeScope>)themesConfigProperty.PropertyValue);
|
||||
|
||||
ThemeScope scope = dict [ThemeManager.DEFAULT_THEME_NAME];
|
||||
Assert.NotNull (scope);
|
||||
Assert.Equal (HighlightStyle.Hover | HighlightStyle.Pressed, scope ["Button.DefaultHighlightStyle"].PropertyValue);
|
||||
|
||||
|
||||
RuntimeConfig = """
|
||||
{
|
||||
"Themes": [
|
||||
{
|
||||
"Default":
|
||||
{
|
||||
"Button.DefaultHighlightStyle": "None"
|
||||
}
|
||||
},
|
||||
{
|
||||
"NewTheme":
|
||||
{
|
||||
"Button.DefaultHighlightStyle": "Hover"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
""";
|
||||
|
||||
Load (ConfigLocations.Runtime);
|
||||
|
||||
// assert
|
||||
Assert.Equal (2, ThemeManager.GetThemes ().Count);
|
||||
Assert.Equal (HighlightStyle.None, (HighlightStyle)ThemeManager.GetCurrentTheme () ["Button.DefaultHighlightStyle"].PropertyValue!);
|
||||
Assert.Equal (HighlightStyle.Hover, (HighlightStyle)ThemeManager.GetThemes () ["NewTheme"] ["Button.DefaultHighlightStyle"].PropertyValue!);
|
||||
|
||||
RuntimeConfig = """
|
||||
{
|
||||
"Themes": [
|
||||
{
|
||||
"Default":
|
||||
{
|
||||
"Button.DefaultHighlightStyle": "Pressed"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
""";
|
||||
Load (ConfigLocations.Runtime);
|
||||
|
||||
// assert
|
||||
Assert.Equal (2, ThemeManager.GetThemes ().Count);
|
||||
Assert.Equal (HighlightStyle.Pressed, (HighlightStyle)ThemeManager.Themes! [ThemeManager.DEFAULT_THEME_NAME] ["Button.DefaultHighlightStyle"].PropertyValue!);
|
||||
Assert.Equal (HighlightStyle.Hover, (HighlightStyle)ThemeManager.Themes! ["NewTheme"] ["Button.DefaultHighlightStyle"].PropertyValue!);
|
||||
|
||||
// clean up
|
||||
Disable (resetToHardCodedDefaults: true);
|
||||
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Apply_ShouldApplyProperties ()
|
||||
{
|
||||
Locations = ConfigLocations.Default;
|
||||
Reset();
|
||||
Enable (ConfigLocations.HardCoded);
|
||||
Load (ConfigLocations.LibraryResources);
|
||||
|
||||
// arrange
|
||||
Assert.Equal (Key.Esc, (Key)Settings ["Application.QuitKey"].PropertyValue);
|
||||
Assert.Equal (Key.Esc, (Key)Settings! ["Application.QuitKey"].PropertyValue);
|
||||
|
||||
Assert.Equal (
|
||||
Key.F6,
|
||||
@@ -65,53 +135,87 @@ public class SettingsScopeTests
|
||||
Assert.Equal (Key.F, Application.NextTabGroupKey);
|
||||
Assert.Equal (Key.B, Application.PrevTabGroupKey);
|
||||
|
||||
Locations = ConfigLocations.All;
|
||||
Reset ();
|
||||
|
||||
Disable (resetToHardCodedDefaults: true);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
[AutoInitShutdown]
|
||||
public void CopyUpdatedPropertiesFrom_ShouldCopyChangedPropertiesOnly ()
|
||||
{
|
||||
Enable (ConfigLocations.HardCoded);
|
||||
Settings ["Application.QuitKey"].PropertyValue = Key.End;
|
||||
|
||||
var updatedSettings = new SettingsScope ();
|
||||
updatedSettings.LoadHardCodedDefaults ();
|
||||
|
||||
///Don't set Quitkey
|
||||
// Don't set Quitkey
|
||||
updatedSettings ["Application.QuitKey"].HasValue = false;
|
||||
updatedSettings ["Application.QuitKey"].PropertyValue = null;
|
||||
updatedSettings ["Application.NextTabGroupKey"].PropertyValue = Key.F;
|
||||
updatedSettings ["Application.PrevTabGroupKey"].PropertyValue = Key.B;
|
||||
|
||||
Settings.Update (updatedSettings);
|
||||
Settings.UpdateFrom (updatedSettings);
|
||||
Assert.Equal (KeyCode.End, ((Key)Settings ["Application.QuitKey"].PropertyValue).KeyCode);
|
||||
Assert.Equal (KeyCode.F, ((Key)updatedSettings ["Application.NextTabGroupKey"].PropertyValue).KeyCode);
|
||||
Assert.Equal (KeyCode.B, ((Key)updatedSettings ["Application.PrevTabGroupKey"].PropertyValue).KeyCode);
|
||||
Disable (resetToHardCodedDefaults: true);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GetHardCodedDefaults_ShouldSetProperties ()
|
||||
public void ResetToHardCodedDefaults_Resets_Config_And_Applies ()
|
||||
{
|
||||
ConfigLocations savedLocations = Locations;
|
||||
Locations = ConfigLocations.Default;
|
||||
Reset ();
|
||||
Enable (ConfigLocations.HardCoded);
|
||||
Load (ConfigLocations.LibraryResources);
|
||||
|
||||
Assert.Equal (6, ((Dictionary<string, ThemeScope>)Settings ["Themes"].PropertyValue).Count);
|
||||
Assert.True (Settings! ["Application.QuitKey"].PropertyValue is Key);
|
||||
Assert.Equal (Key.Esc, Settings ["Application.QuitKey"].PropertyValue as Key);
|
||||
Settings ["Application.QuitKey"].PropertyValue = Key.Q;
|
||||
Apply ();
|
||||
Assert.Equal (Key.Q, Application.QuitKey);
|
||||
|
||||
GetHardCodedDefaults ();
|
||||
Assert.NotEmpty (Themes);
|
||||
Assert.Equal ("Default", Themes.Theme);
|
||||
// Act
|
||||
ResetToHardCodedDefaults ();
|
||||
Assert.Equal (Key.Esc, Settings ["Application.QuitKey"].PropertyValue as Key);
|
||||
Assert.Equal (Key.Esc, Application.QuitKey);
|
||||
|
||||
Assert.True (Settings ["Application.QuitKey"].PropertyValue is Key);
|
||||
Assert.True (Settings ["Application.NextTabGroupKey"].PropertyValue is Key);
|
||||
Assert.True (Settings ["Application.PrevTabGroupKey"].PropertyValue is Key);
|
||||
Disable ();
|
||||
}
|
||||
|
||||
Assert.True (Settings ["Theme"].PropertyValue is string);
|
||||
Assert.Equal ("Default", Settings ["Theme"].PropertyValue as string);
|
||||
|
||||
Assert.True (Settings ["Themes"].PropertyValue is Dictionary<string, ThemeScope>);
|
||||
Assert.Single ((Dictionary<string, ThemeScope>)Settings ["Themes"].PropertyValue);
|
||||
[Fact]
|
||||
public void Themes_Property_Exists ()
|
||||
{
|
||||
var settingsScope = new SettingsScope ();
|
||||
|
||||
Locations = ConfigLocations.All;
|
||||
Reset ();
|
||||
Assert.NotEmpty (settingsScope);
|
||||
|
||||
// Themes exists, but is not initialized
|
||||
Assert.Null (settingsScope ["Themes"].PropertyValue);
|
||||
|
||||
settingsScope.LoadCurrentValues ();
|
||||
|
||||
Assert.NotEmpty (settingsScope);
|
||||
}
|
||||
|
||||
|
||||
[Fact]
|
||||
public void LoadHardCodedDefaults_Resets ()
|
||||
{
|
||||
// Arrange
|
||||
Assert.Equal (Key.Esc, Application.QuitKey);
|
||||
var settingsScope = new SettingsScope ();
|
||||
settingsScope.LoadHardCodedDefaults ();
|
||||
|
||||
// Act
|
||||
settingsScope ["Application.QuitKey"].PropertyValue = Key.Q;
|
||||
settingsScope.Apply ();
|
||||
Assert.Equal (Key.Q, Application.QuitKey);
|
||||
|
||||
settingsScope.LoadHardCodedDefaults ();
|
||||
settingsScope.Apply ();
|
||||
|
||||
// Assert
|
||||
Assert.Equal (Key.Esc, Application.QuitKey);
|
||||
|
||||
Disable (resetToHardCodedDefaults: true);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user