mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-26 15:57:56 +01:00
* Fixes #2680. Make the TextView API more extensible. * Remove unnecessary using. * Add GetLine method. * Change RuneCell Attribute property to ColorScheme property. * Add LoadRuneCells method and unit test. * Add helper method to set all the Colors.ColorSchemes with the same attribute. * Change RuneCell to class. * Add IEquatable<RuneCell> interface. * Fix unit test. * Still fixing unit test. * Fixes #2688. ReadOnly TextView's broken scrolling after version update. * keyModifiers must be reset after key up was been processed. * Trying fix server unit test error. * Prevents throw an exception if RuneCell is null. * Still trying fix this unit test. * Cleaning code. * Fix when the RuneCell is null. * Fix throwing an exception if current column position is greater than the line length. * Fixes #2689. Autocomplete doesn't popup after typing the first character. * Fix Used on TextField. * Always use the original ColorScheme if RuneCell.ColorScheme is null. * Fix Used on TextView. * Add RuneCellEventArgs and draw colors events. * Add two more samples to the scenario. * Fix a bug which was causing unit tests with ColorScheme fail. * Fix a issue when WordWrap is true by always loading the old text. * Improves debugging in RuneCell. * WordWrap is now preserving the ColorScheme of the unwrapped lines. * Simplifying unit test. * Ensures the foreground and background colors are never the same if Used is false. * Remove nullable from the parameter. * Merge syntax highlighting of quotes and keywords together * Add IdxRow property into the RuneCellEventArgs. * Fix pos calculation on windows (where newline in Text is \r\n not \n) * Fix events not being cleared when toggling samples. * Change Undo and Redo to a public method. * Changes some methods names to be more explicit. * Call OnContentsChanged on needed methods and fix some more bugs. * Adds InheritsPreviousColorScheme to allow LoadRuneCells uses personalized color schemes. * Serializes and deserializes RuneCell to a .rce extension file. * Prevents throwing if column is bigger than the line. * Avoids create a color attribute without one of the foreground or background values. In Linux using -1 throws an exception. * Replace SetAllAttributesBasedOn method with a ColorScheme constructor. * Move RuneCell string extensions to TextView.cs * Reverted parameter name from cell to rune. * Change Row to UnwrappedPosition which provide the real unwrapped text position within the Col. * Add brackets to Undo and Redo methods. * Replace all the LoadXXX with Load and rely on the param type to differentiate. * Open a file inside a using. * Proves that the events run twice for WordWrap disabled and the enabled. * Remove GetColumns extension for RuneCell. * Add braces to Undo an Redo. * Change comment. * Add braces. * Delete remarks tag. * Explaining used color and ProcessInheritsPreviousColorScheme. * Fix comment. * Created a RuneCellTests.cs file. * Rename to StringToLinesOfRuneCells. * Make ToRuneCells private. --------- Co-authored-by: Thomas <tznind@dundee.ac.uk> Co-authored-by: Thomas Nind <31306100+tznind@users.noreply.github.com>
180 lines
6.0 KiB
C#
180 lines
6.0 KiB
C#
using Xunit;
|
|
using Terminal.Gui;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Text;
|
|
using System.Threading.Tasks;
|
|
using System.IO;
|
|
using System.Text.Json;
|
|
using static Terminal.Gui.ConfigurationManager;
|
|
using Attribute = Terminal.Gui.Attribute;
|
|
|
|
namespace Terminal.Gui.ConfigurationTests {
|
|
public class ThemeTests {
|
|
public static readonly JsonSerializerOptions _jsonOptions = new JsonSerializerOptions () {
|
|
Converters = {
|
|
new AttributeJsonConverter (),
|
|
new ColorJsonConverter ()
|
|
}
|
|
};
|
|
|
|
[Fact]
|
|
public void TestApply_UpdatesColors ()
|
|
{
|
|
// Arrange
|
|
ConfigurationManager.Reset ();
|
|
|
|
Assert.False (Colors.ColorSchemes.ContainsKey ("test"));
|
|
|
|
var theme = new ThemeScope ();
|
|
Assert.NotEmpty (theme);
|
|
|
|
Themes.Add ("testTheme", theme);
|
|
|
|
var colorScheme = new ColorScheme { Normal = new Attribute (Color.Red, Color.Green) };
|
|
|
|
theme ["ColorSchemes"].PropertyValue = new Dictionary<string, ColorScheme> () {
|
|
{ "test", colorScheme }
|
|
};
|
|
|
|
Assert.Equal (Color.Red, ((Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue) ["test"].Normal.Foreground);
|
|
Assert.Equal (Color.Green, ((Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue) ["test"].Normal.Background);
|
|
|
|
// Act
|
|
Themes.Theme = "testTheme";
|
|
Themes! [ThemeManager.SelectedTheme]!.Apply ();
|
|
|
|
// Assert
|
|
var updatedScheme = Colors.ColorSchemes ["test"];
|
|
Assert.Equal (Color.Red, updatedScheme.Normal.Foreground);
|
|
Assert.Equal (Color.Green, updatedScheme.Normal.Background);
|
|
|
|
// remove test ColorScheme from Colors to avoid failures on others unit tests with ColorScheme
|
|
Colors.ColorSchemes.Remove ("test");
|
|
Assert.Equal (5, Colors.ColorSchemes.Count);
|
|
}
|
|
|
|
[Fact]
|
|
public void TestApply ()
|
|
{
|
|
ConfigurationManager.Reset ();
|
|
|
|
var theme = new ThemeScope ();
|
|
Assert.NotEmpty (theme);
|
|
|
|
Themes.Add ("testTheme", theme);
|
|
|
|
Assert.Equal (LineStyle.Single, FrameView.DefaultBorderStyle);
|
|
theme ["FrameView.DefaultBorderStyle"].PropertyValue = LineStyle.Double; // default is Single
|
|
|
|
Themes.Theme = "testTheme";
|
|
Themes! [ThemeManager.SelectedTheme]!.Apply ();
|
|
|
|
Assert.Equal (LineStyle.Double, FrameView.DefaultBorderStyle);
|
|
}
|
|
|
|
[Fact]
|
|
public void TestUpdatFrom_Change ()
|
|
{
|
|
// arrange
|
|
ConfigurationManager.Reset ();
|
|
|
|
var theme = new ThemeScope ();
|
|
Assert.NotEmpty (theme);
|
|
|
|
var colorScheme = new ColorScheme {
|
|
// note: ColorScheme's can't be partial; default for each attribute
|
|
// is always White/Black
|
|
Normal = new Attribute (Color.Red, Color.Green),
|
|
Focus = new Attribute (Color.Cyan, Color.BrightCyan),
|
|
HotNormal = new Attribute (Color.Brown, Color.BrightYellow),
|
|
HotFocus = new Attribute (Color.Green, Color.BrightGreen),
|
|
Disabled = new Attribute (Color.Gray, Color.DarkGray),
|
|
};
|
|
theme ["ColorSchemes"].PropertyValue = Colors.Create ();
|
|
((Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue) ["test"] = colorScheme;
|
|
|
|
var colorSchemes = (Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue;
|
|
Assert.Equal (colorScheme.Normal, colorSchemes ["Test"].Normal);
|
|
Assert.Equal (colorScheme.Focus, colorSchemes ["Test"].Focus);
|
|
|
|
// Change just Normal
|
|
var newTheme = new ThemeScope ();
|
|
var newColorScheme = new ColorScheme {
|
|
Normal = new Attribute (Color.Blue, Color.BrightBlue),
|
|
|
|
Focus = colorScheme.Focus,
|
|
HotNormal = colorScheme.HotNormal,
|
|
HotFocus = colorScheme.HotFocus,
|
|
Disabled = colorScheme.Disabled,
|
|
};
|
|
newTheme ["ColorSchemes"].PropertyValue = Colors.Create ();
|
|
((Dictionary<string, ColorScheme>)newTheme ["ColorSchemes"].PropertyValue) ["test"] = newColorScheme;
|
|
|
|
// Act
|
|
theme.Update (newTheme);
|
|
|
|
// Assert
|
|
colorSchemes = (Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue;
|
|
// Normal should have changed
|
|
Assert.Equal (Color.Blue, colorSchemes ["Test"].Normal.Foreground);
|
|
Assert.Equal (Color.BrightBlue, colorSchemes ["Test"].Normal.Background);
|
|
Assert.Equal (Color.Cyan, colorSchemes ["Test"].Focus.Foreground);
|
|
Assert.Equal (Color.BrightCyan, colorSchemes ["Test"].Focus.Background);
|
|
}
|
|
|
|
[Fact]
|
|
public void TestUpdatFrom_Add ()
|
|
{
|
|
// arrange
|
|
ConfigurationManager.Reset ();
|
|
|
|
var theme = new ThemeScope ();
|
|
Assert.NotEmpty (theme);
|
|
|
|
theme ["ColorSchemes"].PropertyValue = Colors.Create ();
|
|
var colorSchemes = (Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue;
|
|
Assert.Equal (Colors.ColorSchemes.Count, colorSchemes.Count);
|
|
|
|
var newTheme = new ThemeScope ();
|
|
var colorScheme = new ColorScheme {
|
|
// note: ColorScheme's can't be partial; default for each attribute
|
|
// is always White/Black
|
|
Normal = new Attribute (Color.Red, Color.Green),
|
|
Focus = new Attribute (Color.Cyan, Color.BrightCyan),
|
|
HotNormal = new Attribute (Color.Brown, Color.BrightYellow),
|
|
HotFocus = new Attribute (Color.Green, Color.BrightGreen),
|
|
Disabled = new Attribute (Color.Gray, Color.DarkGray),
|
|
};
|
|
|
|
newTheme ["ColorSchemes"].PropertyValue = Colors.Create ();
|
|
// add a new ColorScheme to the newTheme
|
|
((Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue) ["test"] = colorScheme;
|
|
|
|
colorSchemes = (Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue;
|
|
Assert.Equal (Colors.ColorSchemes.Count + 1, colorSchemes.Count);
|
|
|
|
// Act
|
|
theme.Update (newTheme);
|
|
|
|
// Assert
|
|
colorSchemes = (Dictionary<string, ColorScheme>)theme ["ColorSchemes"].PropertyValue;
|
|
Assert.Equal (colorSchemes ["Test"].Normal, colorScheme.Normal);
|
|
Assert.Equal (colorSchemes ["Test"].Focus, colorScheme.Focus);
|
|
}
|
|
|
|
[Fact]
|
|
public void TestSerialize_RoundTrip ()
|
|
{
|
|
var theme = new ThemeScope ();
|
|
theme ["Dialog.DefaultButtonAlignment"].PropertyValue = Dialog.ButtonAlignments.Right;
|
|
|
|
var json = JsonSerializer.Serialize (theme, _jsonOptions);
|
|
|
|
var deserialized = JsonSerializer.Deserialize<ThemeScope> (json, _jsonOptions);
|
|
|
|
Assert.Equal (Dialog.ButtonAlignments.Right, (Dialog.ButtonAlignments)deserialized ["Dialog.DefaultButtonAlignment"].PropertyValue);
|
|
}
|
|
}
|
|
} |