mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-26 15:57:56 +01:00
* Initial plan * Refactor Application.Mouse - Create IMouse interface and Mouse implementation Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add enhanced documentation for Application.Mouse property Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add parallelizable unit tests for IMouse interface Co-authored-by: tig <585482+tig@users.noreply.github.com> * Refactor Application.Mouse for decoupling and parallelism Co-authored-by: tig <585482+tig@users.noreply.github.com> * Move HandleMouseGrab method to IMouseGrabHandler interface Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add parallelizable tests for IMouse and IMouseGrabHandler interfaces Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add MouseEventRoutingTests - 27 parallelizable tests for View mouse event handling Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fix terminology: Replace parent/child with superView/subView in MouseEventRoutingTests Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fix coding standards: Use explicit types and target-typed new() in test files Co-authored-by: tig <585482+tig@users.noreply.github.com> * Update coding standards documentation with explicit var and target-typed new() guidance Co-authored-by: tig <585482+tig@users.noreply.github.com> * Refactor Application classes and improve maintainability Refactored `Sixel` property to be immutable, enhancing thread safety. Cleaned up `ApplicationImpl` by removing redundant fields, restructuring methods (`CreateDriver`, `CreateSubcomponents`), and improving exception handling. Updated `Run<T>` and `Shutdown` methods for consistency. Standardized logging/debugging messages and fixed formatting issues. Reorganized `IApplication` interface, added detailed XML documentation, and grouped related methods logically. Performed general code cleanup, including fixing typos, improving readability, and removing legacy/unnecessary code to reduce technical debt. * Code cleanup * Remove unreferenced LayoutAndDraw method from ApplicationImpl * Code cleanup and TODOs - Updated namespaces to reflect the new structure. - Added `Driver`, `Force16Colors`, and `ForceDriver` properties. - Introduced `Sixel` collection for sixel image management. - Added lifecycle methods: `GetDriverTypes`, `Shutdown`, and events. - Refactored `Init` to support legacy and modern drivers. - Improved driver event handling and screen abstraction. - Updated `Run` method to align with the application lifecycle. - Simplified `IConsoleDriver` documentation. - Removed redundant methods and improved code readability. * Refactor LayoutAndDraw logic for better encapsulation Refactored `Application.Run` to delegate `LayoutAndDraw` to `ApplicationImpl.Instance.LayoutAndDraw`, improving separation of concerns. Renamed `forceDraw` to `forceRedraw` for clarity and moved `LayoutAndDraw` implementation to `ApplicationImpl`. Added a new `LayoutAndDraw` method in `ApplicationImpl` to handle layout and drawing, including managing `TopLevels`, handling active popovers, and refreshing the screen. Updated the `IApplication` interface to reflect the new method and improved its documentation. Implemented `RequestStop` in `ApplicationImpl` and fixed formatting inconsistencies in `Run<T>`. Added TODOs for future refactoring to encapsulate `Top` and `TopLevels` into an `IViewHierarchy` and move certain properties to `IApplication`. * Refactor ApplicationImpl to enhance mouse and keyboard support Added a new `Mouse` property to the `ApplicationImpl` class, replacing its previous declaration, to improve mouse functionality. Updated `MouseGrabHandler` to initialize with a default instance of `MouseGrabHandler`. Added comments to ensure the preservation of existing keyboard settings (`QuitKey`, `ArrangeKey`, `NextTabKey`) for backward compatibility. These changes enhance clarity, functionality, and maintainability of the class. * Merge IMouseGrabHandler into IMouse - consolidate mouse handling into single interface Co-authored-by: tig <585482+tig@users.noreply.github.com> * Rename Mouse to MouseImpl and Keyboard to KeyboardImpl for consistency Co-authored-by: tig <585482+tig@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: tig <585482+tig@users.noreply.github.com> Co-authored-by: Tig <tig@users.noreply.github.com>
167 lines
4.8 KiB
C#
167 lines
4.8 KiB
C#
using UnitTests;
|
|
using Xunit.Abstractions;
|
|
|
|
namespace UnitTests.ViewTests;
|
|
|
|
public class ShadowStyleTests (ITestOutputHelper output)
|
|
{
|
|
[Theory]
|
|
[InlineData (
|
|
ShadowStyle.None,
|
|
"""
|
|
011
|
|
111
|
|
111
|
|
""")]
|
|
[InlineData (
|
|
ShadowStyle.Transparent,
|
|
"""
|
|
031
|
|
131
|
|
111
|
|
""")]
|
|
[InlineData (
|
|
ShadowStyle.Opaque,
|
|
"""
|
|
021
|
|
221
|
|
111
|
|
""")]
|
|
[SetupFakeDriver]
|
|
public void ShadowView_Colors (ShadowStyle style, string expectedAttrs)
|
|
{
|
|
((IFakeConsoleDriver)Application.Driver!).SetBufferSize (5, 5);
|
|
Color fg = Color.Red;
|
|
Color bg = Color.Green;
|
|
|
|
// 0 - View
|
|
// 1 - SuperView
|
|
// 2 - Opaque - fg is Black, bg is SuperView.Bg
|
|
// 3 - Transparent - fg is darker fg, bg is darker bg
|
|
Attribute [] attributes =
|
|
{
|
|
Attribute.Default,
|
|
new (fg, bg),
|
|
new (Color.Black, bg),
|
|
new (fg.GetDimColor (), bg.GetDimColor ())
|
|
};
|
|
|
|
var superView = new Toplevel
|
|
{
|
|
Height = 3,
|
|
Width = 3,
|
|
Text = "012ABC!@#",
|
|
};
|
|
superView.SetScheme (new (new Attribute (fg, bg)));
|
|
superView.TextFormatter.WordWrap = true;
|
|
|
|
View view = new ()
|
|
{
|
|
Width = Dim.Auto (),
|
|
Height = Dim.Auto (),
|
|
Text = "*",
|
|
ShadowStyle = style,
|
|
};
|
|
view.SetScheme (new (Attribute.Default));
|
|
|
|
superView.Add (view);
|
|
Application.TopLevels.Push (superView);
|
|
Application.LayoutAndDraw (true);
|
|
DriverAssert.AssertDriverAttributesAre (expectedAttrs, output, Application.Driver, attributes);
|
|
Application.ResetState (true);
|
|
}
|
|
|
|
// Visual tests
|
|
[Theory]
|
|
[InlineData (
|
|
ShadowStyle.None,
|
|
"""
|
|
01#$
|
|
AB#$
|
|
!@#$
|
|
!@#$
|
|
""")]
|
|
[InlineData (
|
|
ShadowStyle.Opaque,
|
|
"""
|
|
01▖$
|
|
AB▌$
|
|
▝▀▘$
|
|
!@#$
|
|
""")]
|
|
[InlineData (
|
|
ShadowStyle.Transparent,
|
|
"""
|
|
01#$
|
|
AB#$
|
|
!@#$
|
|
!@#$
|
|
""")]
|
|
[SetupFakeDriver]
|
|
public void Visual_Test (ShadowStyle style, string expected)
|
|
{
|
|
((IFakeConsoleDriver)Application.Driver!).SetBufferSize (5, 5);
|
|
|
|
var superView = new Toplevel
|
|
{
|
|
Width = 4,
|
|
Height = 4,
|
|
Text = "!@#$".Repeat (4)!
|
|
};
|
|
superView.TextFormatter.WordWrap = true;
|
|
|
|
var view = new View
|
|
{
|
|
Text = "01\nAB",
|
|
Width = Dim.Auto (),
|
|
Height = Dim.Auto ()
|
|
};
|
|
view.ShadowStyle = style;
|
|
superView.Add (view);
|
|
Application.TopLevels.Push (superView);
|
|
Application.LayoutAndDraw (true);
|
|
|
|
DriverAssert.AssertDriverContentsWithFrameAre (expected, output);
|
|
view.Dispose ();
|
|
Application.ResetState (true);
|
|
}
|
|
|
|
|
|
[Theory]
|
|
[InlineData (ShadowStyle.None, 0, 0, 0, 0)]
|
|
[InlineData (ShadowStyle.Opaque, 1, 0, 0, 1)]
|
|
[InlineData (ShadowStyle.Transparent, 1, 0, 0, 1)]
|
|
[AutoInitShutdown]
|
|
public void ShadowStyle_Button1Pressed_Causes_Movement (ShadowStyle style, int expectedLeft, int expectedTop, int expectedRight, int expectedBottom)
|
|
{
|
|
var superView = new View
|
|
{
|
|
Height = 10, Width = 10
|
|
};
|
|
|
|
View view = new ()
|
|
{
|
|
Width = Dim.Auto (),
|
|
Height = Dim.Auto (),
|
|
Text = "0123",
|
|
HighlightStates = MouseState.Pressed,
|
|
ShadowStyle = style,
|
|
CanFocus = true
|
|
};
|
|
|
|
superView.Add (view);
|
|
superView.BeginInit ();
|
|
superView.EndInit ();
|
|
|
|
Thickness origThickness = view.Margin!.Thickness;
|
|
view.NewMouseEvent (new () { Flags = MouseFlags.Button1Pressed, Position = new (0, 0) });
|
|
Assert.Equal (new (expectedLeft, expectedTop, expectedRight, expectedBottom), view.Margin.Thickness);
|
|
|
|
view.NewMouseEvent (new () { Flags = MouseFlags.Button1Released, Position = new (0, 0) });
|
|
Assert.Equal (origThickness, view.Margin.Thickness);
|
|
|
|
// Button1Pressed, Button1Released cause Application.Mouse.MouseGrabView to be set
|
|
Application.ResetState (true);
|
|
}
|
|
}
|