mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-26 15:57:56 +01:00
* Fixes #4274. Using Windows Host Console v2win is rendering window size badly using VSDebugConsole.exe * Fixes #4259. Our wcwidth library is out of date (#4281) * Update package versions and remove hack code from RuneExtensions Updated several package versions in `Directory.Packages.props`, including `JetBrains.Annotations`, `Microsoft.Extensions.Logging.Abstractions`, `System.IO.Abstractions`, and `Wcwidth`. Refactored methods in `RuneExtensions.cs`: - Simplified `GetColumns` by removing special Unicode handling. - Renamed constants to follow naming conventions. - Improved logic and readability in `DecodeSurrogatePair`, `Encode`, and `GetEncodingLength`. - Streamlined `IsSurrogatePair` and `MakePrintable` for clarity and efficiency. * Update package version ranges for flexibility Updated the `JetBrains.Annotations` package to use a version range starting from `2025.2.2` to allow future updates. Adjusted the `Microsoft.Extensions.Logging.Abstractions` package to a version range `[9.0.0,10)` for compatibility. Changed `System.IO.Abstractions` to a range `[22.0.16,23)` and `Wcwidth` to `[3.0.0,)` to enable future updates within specified ranges. * Remove legacy drivers, simplify architecture, and reorganize codebase structure (#4270) * Initial plan * Remove legacy drivers and reorganize v2 architecture Co-authored-by: tig <585482+tig@users.noreply.github.com> * Extract Windows key helper utilities and fix build Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fix all test references to legacy drivers Co-authored-by: tig <585482+tig@users.noreply.github.com> * Update documentation to reflect new driver architecture Co-authored-by: tig <585482+tig@users.noreply.github.com> * Remove V2.cd diagram file Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fix test failures: support legacy drivers and update exception handling Co-authored-by: tig <585482+tig@users.noreply.github.com> * updated driver names * Move V2 tests from ConsoleDrivers/V2 to proper locations Co-authored-by: tig <585482+tig@users.noreply.github.com> * Rename ApplicationV2 to ModernApplicationImpl to remove v2 terminology Co-authored-by: tig <585482+tig@users.noreply.github.com> * Remove V2 terminology from test drivers and FakeDriver classes Co-authored-by: tig <585482+tig@users.noreply.github.com> * Merge ModernApplicationImpl into ApplicationImpl and move to App folder Co-authored-by: tig <585482+tig@users.noreply.github.com> * Create modern FakeDriver with component factory architecture in Terminal.Gui project Co-authored-by: tig <585482+tig@users.noreply.github.com> * Refactor: Move non-platform-dependent code from /Drivers to /App Co-authored-by: tig <585482+tig@users.noreply.github.com> * Code cleanup and org * Unit test reorg * Refactor MainLoop architecture: rename classes and enhance documentation for clarity Co-authored-by: tig <585482+tig@users.noreply.github.com> * Add comprehensive FakeDriver tests (WIP - some tests need fixes) Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fixed FakeDriver build failures * Fix all FakeDriver test failures - Application.Top creation and clipboard behaviors Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fixed FakeDriver build failures2 * Remove hanging legacy FakeDriver tests that use Console.MockKeyPresses Co-authored-by: tig <585482+tig@users.noreply.github.com> * Fixed some tests * Fixed more tests * Fixed more tests * Fix bad copilot (#4277) * Update Terminal.Gui/Drivers/FakeDriver/FakeConsoleOutput.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Refactor Application Init and Update Tests Refactored `Application.Init` to improve initialization logic: - Added fallback to `ForceDriver` when `driverName` is null. - Changed repeated `Init` calls to throw `InvalidOperationException`. - Updated `_driverName` assignment logic for robustness. Enhanced `IConsoleDriver` with detailed remarks on implementations. Revised test cases to align with updated `Application.Init` behavior: - Replaced `FakeDriver` with `null` and `driverName: "fake"`. - Skipped or commented out tests incompatible with new logic. - Improved formatting and removed redundant setup code. Improved code style and consistency across the codebase: - Standardized parameter formatting and spacing. - Removed outdated comments and unused code. General cleanup to enhance readability and maintainability. * Warp fix copilot (#4278) * More fixes (#4279) * Fixes/works around test failures and temporarily disable failing test Updated `FakeDriver` to set `RunningUnitTests` to `true` and initialize dimensions using `FakeConsole`. Modified `TestRespondersDisposedAttribute` to set `ConsoleDriver.RunningUnitTests` in the `Before` method, ensuring proper behavior during unit tests. Temporarily disabled the `Button_CanFocus_False_Raises_Accepted_Correctly` test in `ViewCommandTests` by adding a `Skip` parameter to the `[Fact]` attribute, referencing issue #4270. * Allow all tests to run despite failures in UnitTests Modified the `dotnet test` command in the `Run UnitTestsParallelizable` step to set `xunit.stopOnFail` to `false`. This ensures that the test runner does not stop execution on the first failure, allowing all tests to execute regardless of individual test outcomes. * Refactor ApplicationScreenTests for cleaner setup/teardown Refactored `ClearContents_Called_When_Top_Frame_Changes` test: - Added `[AutoInitShutdown]` attribute for automatic lifecycle management. - Replaced manual `Application.Init` and `Application.Top` setup with `Application.Begin` and `RunState`. - Simplified event handling by defining `ClearedContents` handler inline. - Removed explicit cleanup logic, relying on `Application.End` for teardown. Updated `using` directives to include `UnitTests` namespace. * Attempt to fix intermittent local test failures. Update ApplicationImpl initialization parameter Changed the second parameter of the `impl.Init` method in the `FakeApplicationFactory` class from `"dotnet"` to `"fake"`. * Code cleanup to cause Action to re-run. * Stop tests on first failure in UnitTestsParallelizable Updated the `dotnet test` command in `unit-tests.yml` to set the `xunit.stopOnFail` parameter to `true`. This change ensures that test execution halts immediately upon encountering a failure, allowing quicker identification and resolution of issues. Note that this may prevent the full test suite from running in the event of a failure. * Allow all tests to run despite failures in CI Updated `unit-tests.yml` to set `xunit.stopOnFail` to `false` in both `Run UnitTests` and `Run UnitTestsParallelizable` steps. This ensures that the test runner does not stop execution on the first test failure, allowing all tests to complete even if some fail. * Enhance RuneExtensions docs and update user dictionary Updated the `<remarks>` section in `RuneExtensions.GetColumns` to include details about the `wcwidth` implementation and improved readability with `<para>` tags. Added `wcwidth` to the user dictionary in `Terminal.sln.DotSettings` to avoid spelling errors. * Improve XML doc formatting in RuneExtensions.cs Updated the remarks section of the `GetColumns` method in the `RuneExtensions` class to enhance readability by reformatting and properly indenting `<para>` tags. The content remains unchanged, describing the method's implementation via `wcwidth` and its role as a Terminal.Gui extension for `System.Text.Rune`. * Refactor drivers and improve clipboard handling Replaced legacy drivers (`CursesDriver`, `NetDriver`) with `UnixDriver` and `DotNetDriver` across the codebase, including comments, method names, and test cases. Updated documentation and remarks to reflect the new driver names and platforms. Revamped clipboard handling with new platform-specific implementations: `UnixClipboard` for Unix, `MacOSXClipboard` for macOS, and `WSLClipboard` for Linux under WSL. Removed the old `CursesClipboard` and consolidated clipboard logic. Updated test cases to align with the new drivers and clipboard implementations. Improved naming consistency and cleaned up redundant code. Updated the README and documentation to reflect these changes. * Remove `PlatformColor` from `Attribute` struct This commit removes the `PlatformColor` property from the `Attribute` struct, simplifying the codebase by eliminating platform-specific color handling. The following changes were made: - Removed `PlatformColor` from the `Attribute` struct, including its initialization, usage, and related comments. - Updated constructors to no longer initialize or use `PlatformColor`. - Modified `Equals` and `GetHashCode` methods to exclude `PlatformColor`. - Updated `UnixComponentFactory` documentation to remove references to "v2unix." - Renamed `v2TestDriver` to `testDriver` in the `With` class for clarity. - Removed `PlatformColor` references in `DriverAssert` and related error messages. - Deleted test cases in `AttributeTests` that relied on `PlatformColor`. - Cleaned up comments and TODOs related to `PlatformColor` and `UnixDriver`. These changes reflect a shift away from platform-dependent color management, improving code clarity and reducing complexity. Remove `PlatformColor` and simplify `Attribute` logic The `PlatformColor` property has been removed from the `Attribute` struct, along with its associated logic, simplifying the codebase and eliminating platform-specific dependencies. Constructors, equality checks, and hash code generation in `Attribute` have been updated accordingly. The `CurrentAttribute` property in `ConsoleDriver` and `OutputBuffer` has been simplified, removing dependencies on `Application.Driver`. The `MakeColor` method logic has been removed or simplified in related classes. Tests in `AttributeTests` have been refactored to reflect these changes, focusing on `Foreground`, `Background`, and `Style`. Unix-specific logic tied to `PlatformColor` has been eliminated. Additional updates include renaming parameters in the `With` class for clarity, simplifying `DriverAssert` output, and performing minor code cleanups to improve readability and maintainability. * Refactor Terminal.Gui driver architecture for v2 Updated documentation to reflect the new modular driver architecture in Terminal.Gui v2. - Revised `namespace-drivers.md` to include new components (`IConsoleInput`, `IConsoleOutput`, `IInputProcessor`, `IOutputBuffer`, `IWindowSizeMonitor`) and terminal size monitoring. - Replaced "Key Components" with "Architecture Overview" and added details on the **Component Factory** pattern. - Documented the four driver implementations (`DotNetDriver`, `WindowsDriver`, `UnixDriver`, `FakeDriver`) and their platform-specific optimizations. - Added a "Threading Model" section to explain the multi-threaded design for responsive input handling. - Updated examples to demonstrate driver capabilities and explicit driver selection. In `drivers.md`: - Expanded the "Overview" to emphasize the modular, component-based architecture. - Reorganized "Drivers" into "Available Drivers" and added details on `FakeDriver` for unit testing. - Added sections on "Initialization Flow," "Shutdown Flow," and platform-specific driver details. - Provided examples for accessing driver components and creating custom drivers. In `index.md`: - Updated "Cross Platform" feature to reflect new driver names and clarified compatibility with SSH and monochrome terminals. * Moved files around --------- 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> Co-authored-by: Thomas Nind <31306100+tznind@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Fix nit test. * Change ClearScreenNextIteration to internal and trying to fix unit test failure * Reuse method and fix text field color to normal, probably due some changed configuration * Fix scenario Shortcut not restoring Application.Quit * Giving more time to load Scrolling scenario and display failing scenario * Revert changes and add more assertions * Forcing CI tests again and I suspect that is causing by UpdateFromJson unit test * Changed test to force fake driver * Ensure restore the original colors * Update test runner behavior in unit-tests.yml Changed `fail-fast` to `false` in `non_parallel_unittests` to allow all runners to complete even if errors occur. Updated `xunit.stopOnFail` to `true` in both `Run UnitTests` and `Run UnitTestsParallelizable` steps to stop test execution immediately upon failure. These changes improve test handling and execution consistency. Refactor and enhance configuration and scheme handling Refactored `ConfigurationManager` and `Scope<T>` to improve clarity and ensure proper resetting to hardcoded defaults. Updated `Color` constructor to use ARGB values for accuracy. Added debug assertions and logging for better test reliability. Expanded test coverage: - Verified hardcoded schemes and themes reset correctly. - Added tests for `UpdateFromJson` behavior and `Color.ToString` output. - Improved `SchemeManager` and `SchemeTests` to validate attributes and scheme overrides. General improvements include better state management during tests and enhanced readability of event handlers. * Found cause of #4288 and provided a workaround * Reverted unneeded change to ComboBoxTests * Fixed test that wasn't actually testing anything * Added more precise unit test showing issue * Added more precise unit test showing issue2 * Made test even more precise * Potential fix for underlying issue * Fixed test that broke with last change * Reverted`ConfigurationManager` to return `_hardCodedConfigPropertyCache` directly, eliminating deep copy overhead for better performance. Added a new test in `ConfigurationManagerTests` to verify that `GetHardCodedConfigPropertyCache` always returns the same reference. Updated existing tests to reflect this change. Refactored `SchemeManagerTests` to use `try-finally` blocks for proper cleanup and improved test reliability. Applied similar changes to other test methods for consistency. Re-enabled the `UpdateFrom_Corrupts_Schemes_HardCodeDefaults` test in `ThemeScopeTests` as the underlying issue has been rnot been esolved. * Updated the `Disable` method calls across test classes to use the new overload with a `true` parameter, ensuring consistent behavior. * Refactor and fix configuration and theme management Refactored method names across multiple classes for clarity and consistency (e.g., `LoadCurrentValues` to `UpdateToCurrentValues`, `ResetToHardCodedDefaults` to `LoadHardCodedDefaults`). Removed redundant attributes from `ConfigurationManager`. Implemented a workaround for `SchemeManager` to address issues with hard-coded schemes being overwritten. Updated `ThemeManager` logic to ensure proper initialization and updates of themes. Aligned unit tests with refactored methods and added comments to document changes. Made minor adjustments to improve code maintainability, including handling of property values and removal of unused variables. * Fix hard-coded defaults corruption in ThemeScope Replaced `ResetToCurrentValues` with `ResetToHardCodedDefaults` across multiple files to address corruption of hard-coded defaults. - Added a partial workaround in `ConfigurationManager.cs` to prevent overwriting hard-coded schemes in `ThemeScope`. - Highlighted known issues with `UpdateToCurrentValues` in `ThemeManager.cs`. - Updated tests in `ConfigurationManagerTests`, `SchemeManagerTests`, and others to reflect the reset method. - Skipped or modified tests that rely on `ResetToCurrentValues` due to its corruption issues. - Refactored `GlyphTests` to ensure proper cleanup using `try-finally`. - Added comments and skipped tests to document and work around known bugs (e.g., #4288). * Clarify comments and add theme reset functionality Updated comments in `SchemeManager` and `ThemeManager` to clarify that the workaround for hardcoded schemes is partial. Added a new `LoadHardCodedDefaults` method to `ThemeManager`, marked with `[RequiresUnreferencedCode]` and `[RequiresDynamicCode]`, to reset themes to hardcoded defaults. This method ensures proper initialization by throwing an exception if `ConfigurationManager` is not initialized. Updated `ThemeManager` to call `SchemeManager.LoadToHardCodedDefaults` during the theme reset process, ensuring consistent loading of hardcoded schemes. * Removed special handling for the "Schemes" key in `hardCodedThemeProperties`, * Code cleanup Refactored XML documentation comments for better readability. Enhanced exception handling in `GetScheme(Schemes)` by adding a null check and throwing `ArgumentException` for invalid inputs. Simplified method definitions by converting multi-line methods to single-line. Updated attributes for `LoadToHardCodedDefaults` to align with the `SetSchemes` method. Refactored `LoadToHardCodedDefaults` implementation for cleaner code. Added support for Visual Studio debug console in `WindowsDriver`, including disabling the alternative screen buffer, preserving original console colors, and restoring them on shutdown. Performed general code cleanup, including removing unnecessary comments and improving inline comments for clarity. * Refactor and remove redundant validation methods Removed `Validate` methods from `ConfigurationManager`, `Scope<T>`, and `ThemeManager`, indicating a shift in validation responsibilities. Enabled nullable reference types in `Scope.cs` to enforce stricter nullability checks. Simplified `Scope<T>` constructor and replaced explicit type declarations with `var` for improved readability. Adjusted LINQ query formatting and removed unused `using System.Text.Json;` to clean up dependencies. Made minor formatting changes for consistency and maintainability. * Refactor ConfigurationManager for clarity and safety Renamed `ResetToCurrentValues` to `UpdateToCurrentValues` for better clarity and updated all references, including comments and documentation. Introduced `_hardCodedConfigPropertyCacheLock` to ensure thread-safety when accessing `_hardCodedConfigPropertyCache`. Updated `Reset` terminology to `Update` across the codebase to reflect the updated behavior. Improved `SerializerContext` initialization with concise syntax and fixed a formatting issue in a `Console.WriteLine` statement. Reformatted filtering logic for `configPropertiesByScope` for better readability. Updated test cases in `AppSettingsScopeTests` and `ConfigurationManagerTests` to align with the renamed method and ensure consistent functionality. * Code cleanup Improve readability and handle null in serialization Refactored LINQ queries to remove redundant line breaks, improving code readability. Updated comments for clarity and adjusted tone. Added a null check for the `prop` variable during serialization to ensure proper handling of null values by writing `null` to the JSON writer. * Code Cleanup - Refactor ThemeManager and improve nullability handling Updated ThemeManager to improve method visibility, naming consistency, and documentation. Introduced `GetHardCodedThemes` and `SetThemes` for better encapsulation. Made `DEFAULT_THEME_NAME` public for broader access. Enhanced nullability handling across multiple files using the null-forgiving operator (`!`) to suppress warnings. Refactored `Themes.cs` to ensure proper cleanup of `allViewsView`. Simplified assertions in test files to reflect updated method visibility and removed redundant checks. Improved code clarity and maintainability throughout the codebase. --------- Co-authored-by: BDisp <bd.bdisp@gmail.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: tig <585482+tig@users.noreply.github.com> Co-authored-by: Thomas Nind <31306100+tznind@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
536 lines
24 KiB
C#
536 lines
24 KiB
C#
#nullable enable
|
|
|
|
using System.Collections.ObjectModel;
|
|
using Timer = System.Timers.Timer;
|
|
|
|
namespace UICatalog.Scenarios;
|
|
|
|
[ScenarioMetadata ("Shortcuts", "Illustrates Shortcut class.")]
|
|
[ScenarioCategory ("Controls")]
|
|
public class Shortcuts : Scenario
|
|
{
|
|
public override void Main ()
|
|
{
|
|
Application.Init ();
|
|
var quitKey = Application.QuitKey;
|
|
Window app = new ();
|
|
|
|
app.Loaded += App_Loaded;
|
|
|
|
Application.Run (app);
|
|
app.Dispose ();
|
|
Application.Shutdown ();
|
|
Application.QuitKey = quitKey;
|
|
}
|
|
|
|
// Setting everything up in Loaded handler because we change the
|
|
// QuitKey and it only sticks if changed after init
|
|
private void App_Loaded (object? sender, EventArgs e)
|
|
{
|
|
Application.QuitKey = Key.F4.WithCtrl;
|
|
Application.Top!.Title = GetQuitKeyAndName ();
|
|
|
|
ObservableCollection<string> eventSource = new ();
|
|
|
|
var eventLog = new ListView
|
|
{
|
|
Id = "eventLog",
|
|
X = Pos.AnchorEnd (),
|
|
Y = 0,
|
|
Height = Dim.Fill (4),
|
|
SchemeName = "TopLevel",
|
|
Source = new ListWrapper<string> (eventSource),
|
|
BorderStyle = LineStyle.Double,
|
|
Title = "E_vents"
|
|
};
|
|
|
|
eventLog.Width = Dim.Func (
|
|
_ => Math.Min (
|
|
Application.Top.Viewport.Width / 2,
|
|
eventLog?.MaxLength + eventLog!.GetAdornmentsThickness ().Horizontal ?? 0));
|
|
|
|
eventLog.Width = Dim.Func (
|
|
_ => Math.Min (
|
|
eventLog.SuperView!.Viewport.Width / 2,
|
|
eventLog?.MaxLength + eventLog!.GetAdornmentsThickness ().Horizontal ?? 0));
|
|
Application.Top.Add (eventLog);
|
|
|
|
var alignKeysShortcut = new Shortcut
|
|
{
|
|
Id = "alignKeysShortcut",
|
|
X = 0,
|
|
Y = 0,
|
|
Width = Dim.Fill ()! - Dim.Width (eventLog),
|
|
HelpText = "Fill to log",
|
|
CommandView = new CheckBox
|
|
{
|
|
Text = "_Align Keys",
|
|
CanFocus = false,
|
|
HighlightStates = MouseState.None
|
|
},
|
|
Key = Key.F5.WithCtrl.WithAlt.WithShift
|
|
};
|
|
|
|
// ((CheckBox)vShortcut3.CommandView).CheckedStateChanging += (_, args) =>
|
|
((CheckBox)alignKeysShortcut.CommandView).CheckedStateChanging += (s, e) =>
|
|
{
|
|
if (alignKeysShortcut.CommandView is CheckBox cb)
|
|
{
|
|
eventSource.Add (
|
|
$"{alignKeysShortcut.Id}.CommandView.CheckedStateChanging: {cb.Text}");
|
|
eventLog.MoveDown ();
|
|
|
|
var max = 0;
|
|
|
|
IEnumerable<View> toAlign =
|
|
Application.Top.SubViews.Where (
|
|
v => v is Shortcut { Width: not DimAbsolute });
|
|
IEnumerable<View> enumerable = toAlign as View [] ?? toAlign.ToArray ();
|
|
|
|
if (e.Result == CheckState.Checked)
|
|
{
|
|
max = (from Shortcut? peer in enumerable
|
|
select peer.Key.ToString ().GetColumns ()).Prepend (max)
|
|
.Max ();
|
|
|
|
foreach (View view in enumerable)
|
|
{
|
|
var peer = (Shortcut)view;
|
|
max = Math.Max (max, peer.KeyView.Text.GetColumns ());
|
|
}
|
|
}
|
|
|
|
foreach (View view in enumerable)
|
|
{
|
|
var peer = (Shortcut)view;
|
|
peer.MinimumKeyTextSize = max;
|
|
}
|
|
}
|
|
};
|
|
Application.Top.Add (alignKeysShortcut);
|
|
|
|
var commandFirstShortcut = new Shortcut
|
|
{
|
|
Id = "commandFirstShortcut",
|
|
X = 0,
|
|
Y = Pos.Bottom (alignKeysShortcut),
|
|
Width = Dim.Fill ()! - Dim.Width (eventLog),
|
|
HelpText = "Show _Command first",
|
|
CommandView = new CheckBox
|
|
{
|
|
Text = "Command _First",
|
|
CanFocus = false,
|
|
HighlightStates = MouseState.None
|
|
},
|
|
Key = Key.F.WithCtrl
|
|
};
|
|
|
|
((CheckBox)commandFirstShortcut.CommandView).CheckedState =
|
|
commandFirstShortcut.AlignmentModes.HasFlag (AlignmentModes.EndToStart) ? CheckState.UnChecked : CheckState.Checked;
|
|
|
|
((CheckBox)commandFirstShortcut.CommandView).CheckedStateChanging += (s, e) =>
|
|
{
|
|
if (commandFirstShortcut.CommandView is CheckBox cb)
|
|
{
|
|
eventSource.Add (
|
|
$"{commandFirstShortcut.Id}.CommandView.CheckedStateChanging: {cb.Text}");
|
|
eventLog.MoveDown ();
|
|
|
|
IEnumerable<View> toAlign =
|
|
Application.Top.SubViews.Where (
|
|
v => v is Shortcut { Width: not DimAbsolute });
|
|
IEnumerable<View> enumerable = toAlign as View [] ?? toAlign.ToArray ();
|
|
|
|
foreach (View view in enumerable)
|
|
{
|
|
var peer = (Shortcut)view;
|
|
|
|
if (e.Result == CheckState.Checked)
|
|
{
|
|
peer.AlignmentModes &= ~AlignmentModes.EndToStart;
|
|
}
|
|
else
|
|
{
|
|
peer.AlignmentModes |= AlignmentModes.EndToStart;
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
Application.Top.Add (commandFirstShortcut);
|
|
|
|
var canFocusShortcut = new Shortcut
|
|
{
|
|
Id = "canFocusShortcut",
|
|
X = 0,
|
|
Y = Pos.Bottom (commandFirstShortcut),
|
|
Width = Dim.Fill ()! - Dim.Width (eventLog),
|
|
Key = Key.F4,
|
|
HelpText = "Changes all Command.CanFocus",
|
|
CommandView = new CheckBox { Text = "_CanFocus" }
|
|
};
|
|
|
|
((CheckBox)canFocusShortcut.CommandView).CheckedStateChanging += (s, e) =>
|
|
{
|
|
if (canFocusShortcut.CommandView is CheckBox cb)
|
|
{
|
|
eventSource.Add ($"Toggle: {cb.Text}");
|
|
eventLog.MoveDown ();
|
|
|
|
//cb.CanFocus = e.NewValue == CheckState.Checked;
|
|
|
|
foreach (Shortcut peer in Application.Top.SubViews.Where (v => v is Shortcut)!)
|
|
{
|
|
if (peer.CanFocus)
|
|
{
|
|
peer.CommandView.CanFocus = e.Result == CheckState.Checked;
|
|
}
|
|
}
|
|
}
|
|
};
|
|
Application.Top.Add (canFocusShortcut);
|
|
|
|
var appShortcut = new Shortcut
|
|
{
|
|
Id = "appShortcut",
|
|
X = 0,
|
|
Y = Pos.Bottom (canFocusShortcut),
|
|
Width = Dim.Fill (Dim.Func (_ => eventLog.Frame.Width)),
|
|
Title = "A_pp Shortcut",
|
|
Key = Key.F1,
|
|
Text = "Width is DimFill",
|
|
BindKeyToApplication = true
|
|
};
|
|
|
|
Application.Top.Add (appShortcut);
|
|
|
|
var buttonShortcut = new Shortcut
|
|
{
|
|
Id = "buttonShortcut",
|
|
X = 0,
|
|
Y = Pos.Bottom (appShortcut),
|
|
Width = Dim.Fill ()! - Dim.Width (eventLog),
|
|
HelpText = "Accepting pops MB",
|
|
CommandView = new Button
|
|
{
|
|
Title = "_Button",
|
|
ShadowStyle = ShadowStyle.None,
|
|
HighlightStates = MouseState.None
|
|
},
|
|
Key = Key.K
|
|
};
|
|
var button = (Button)buttonShortcut.CommandView;
|
|
buttonShortcut.Accepting += Button_Clicked;
|
|
|
|
Application.Top.Add (buttonShortcut);
|
|
|
|
var radioGroupShortcut = new Shortcut
|
|
{
|
|
Id = "radioGroupShortcut",
|
|
X = 0,
|
|
Y = Pos.Bottom (buttonShortcut),
|
|
Key = Key.F2,
|
|
Width = Dim.Fill ()! - Dim.Width (eventLog),
|
|
CommandView = new RadioGroup
|
|
{
|
|
Orientation = Orientation.Vertical,
|
|
RadioLabels = ["O_ne", "T_wo", "Th_ree", "Fo_ur"]
|
|
}
|
|
};
|
|
|
|
((RadioGroup)radioGroupShortcut.CommandView).SelectedItemChanged += (o, args) =>
|
|
{
|
|
if (o is { })
|
|
{
|
|
eventSource.Add (
|
|
$"SelectedItemChanged: {o.GetType ().Name} - {args.SelectedItem}");
|
|
eventLog.MoveDown ();
|
|
}
|
|
};
|
|
|
|
Application.Top.Add (radioGroupShortcut);
|
|
|
|
var sliderShortcut = new Shortcut
|
|
{
|
|
Id = "sliderShortcut",
|
|
X = 0,
|
|
Y = Pos.Bottom (radioGroupShortcut),
|
|
Width = Dim.Fill ()! - Dim.Width (eventLog),
|
|
HelpText = "Sliders work!",
|
|
CommandView = new Slider<string>
|
|
{
|
|
Orientation = Orientation.Horizontal,
|
|
AllowEmpty = true
|
|
},
|
|
Key = Key.F5
|
|
};
|
|
|
|
((Slider<string>)sliderShortcut.CommandView).Options = [new () { Legend = "A" }, new () { Legend = "B" }, new () { Legend = "C" }];
|
|
((Slider<string>)sliderShortcut.CommandView).SetOption (0);
|
|
|
|
((Slider<string>)sliderShortcut.CommandView).OptionsChanged += (o, args) =>
|
|
{
|
|
eventSource.Add (
|
|
$"OptionsChanged: {o?.GetType ().Name} - {string.Join (",", ((Slider<string>)o!)!.GetSetOptions ())}");
|
|
eventLog.MoveDown ();
|
|
};
|
|
|
|
Application.Top.Add (sliderShortcut);
|
|
|
|
var noCommandShortcut = new Shortcut
|
|
{
|
|
Id = "noCommandShortcut",
|
|
X = 0,
|
|
Y = Pos.Bottom (sliderShortcut),
|
|
Width = Dim.Width (sliderShortcut),
|
|
HelpText = "No Command",
|
|
Key = Key.D0
|
|
};
|
|
|
|
Application.Top.Add (noCommandShortcut);
|
|
|
|
var noKeyShortcut = new Shortcut
|
|
{
|
|
Id = "noKeyShortcut",
|
|
X = 0,
|
|
Y = Pos.Bottom (noCommandShortcut),
|
|
Width = Dim.Width (noCommandShortcut),
|
|
|
|
Title = "No Ke_y",
|
|
HelpText = "Keyless"
|
|
};
|
|
|
|
Application.Top.Add (noKeyShortcut);
|
|
|
|
var noHelpShortcut = new Shortcut
|
|
{
|
|
Id = "noHelpShortcut",
|
|
X = 0,
|
|
Y = Pos.Bottom (noKeyShortcut),
|
|
Width = Dim.Width (noKeyShortcut),
|
|
Key = Key.F6,
|
|
Title = "Not _very much help",
|
|
HelpText = ""
|
|
};
|
|
|
|
Application.Top.Add (noHelpShortcut);
|
|
noHelpShortcut.SetFocus ();
|
|
|
|
var framedShortcut = new Shortcut
|
|
{
|
|
Id = "framedShortcut",
|
|
X = 0,
|
|
Y = Pos.Bottom (noHelpShortcut) + 1,
|
|
Title = "Framed",
|
|
Key = Key.K.WithCtrl,
|
|
Text = "Resize frame",
|
|
BorderStyle = LineStyle.Dotted,
|
|
Arrangement = ViewArrangement.RightResizable | ViewArrangement.BottomResizable
|
|
};
|
|
framedShortcut.Orientation = Orientation.Horizontal;
|
|
|
|
if (framedShortcut.Padding is { })
|
|
{
|
|
framedShortcut.Padding.Thickness = new (0, 1, 0, 0);
|
|
framedShortcut.Padding.Diagnostics = ViewDiagnosticFlags.Ruler;
|
|
}
|
|
|
|
if (framedShortcut.CommandView.Margin is { })
|
|
{
|
|
framedShortcut.CommandView.Margin.SchemeName = framedShortcut.CommandView.SchemeName = "Error";
|
|
framedShortcut.HelpView.Margin!.SchemeName = framedShortcut.HelpView.SchemeName = "Dialog";
|
|
framedShortcut.KeyView.Margin!.SchemeName = framedShortcut.KeyView.SchemeName = "Menu";
|
|
}
|
|
|
|
framedShortcut.SchemeName = "TopLevel";
|
|
Application.Top.Add (framedShortcut);
|
|
|
|
// Horizontal
|
|
var progressShortcut = new Shortcut
|
|
{
|
|
Id = "progressShortcut",
|
|
X = Pos.Align (Alignment.Start, AlignmentModes.IgnoreFirstOrLast, 1),
|
|
Y = Pos.AnchorEnd () - 1,
|
|
Key = Key.F7,
|
|
HelpText = "Horizontal"
|
|
};
|
|
|
|
progressShortcut.CommandView = new ProgressBar
|
|
{
|
|
Text = "Progress",
|
|
Title = "P",
|
|
Fraction = 0.5f,
|
|
Width = 10,
|
|
Height = 1,
|
|
ProgressBarStyle = ProgressBarStyle.Continuous
|
|
};
|
|
progressShortcut.CommandView.Width = 10;
|
|
progressShortcut.CommandView.Height = 1;
|
|
progressShortcut.CommandView.CanFocus = false;
|
|
|
|
Timer timer = new (10)
|
|
{
|
|
AutoReset = true
|
|
};
|
|
|
|
timer.Elapsed += (o, args) =>
|
|
{
|
|
if (progressShortcut.CommandView is ProgressBar pb)
|
|
{
|
|
if (pb.Fraction == 1.0)
|
|
{
|
|
pb.Fraction = 0;
|
|
}
|
|
|
|
pb.Fraction += 0.01f;
|
|
|
|
Application.Wakeup ();
|
|
|
|
pb.SetNeedsDraw ();
|
|
}
|
|
};
|
|
timer.Start ();
|
|
|
|
Application.Top.Add (progressShortcut);
|
|
|
|
var textField = new TextField
|
|
{
|
|
Text = "Edit me",
|
|
Width = 10,
|
|
Height = 1
|
|
};
|
|
|
|
var textFieldShortcut = new Shortcut
|
|
{
|
|
Id = "textFieldShortcut",
|
|
X = Pos.Align (Alignment.Start, AlignmentModes.IgnoreFirstOrLast, 1),
|
|
Y = Pos.AnchorEnd () - 1,
|
|
Key = Key.F8,
|
|
HelpText = "TextField",
|
|
CanFocus = true,
|
|
CommandView = textField
|
|
};
|
|
textField.CanFocus = true;
|
|
|
|
Application.Top.Add (textFieldShortcut);
|
|
|
|
var bgColorShortcut = new Shortcut
|
|
{
|
|
Id = "bgColorShortcut",
|
|
X = Pos.Align (Alignment.Start, AlignmentModes.IgnoreFirstOrLast, 1),
|
|
Y = Pos.AnchorEnd (),
|
|
Key = Key.F9,
|
|
HelpText = "Cycles BG Color"
|
|
};
|
|
|
|
var bgColor = new ColorPicker16
|
|
{
|
|
BoxHeight = 1,
|
|
BoxWidth = 1
|
|
};
|
|
|
|
bgColorShortcut.Selecting += (o, args) =>
|
|
{
|
|
//args.Cancel = true;
|
|
};
|
|
|
|
bgColorShortcut.Accepting += (o, args) =>
|
|
{
|
|
if (bgColor.SelectedColor == ColorName16.White)
|
|
{
|
|
bgColor.SelectedColor = ColorName16.Black;
|
|
|
|
return;
|
|
}
|
|
|
|
bgColor.SelectedColor++;
|
|
args.Handled = true;
|
|
};
|
|
|
|
bgColor.ColorChanged += (o, args) =>
|
|
{
|
|
if (o is { })
|
|
{
|
|
eventSource.Add ($"ColorChanged: {o.GetType ().Name} - {args.Result}");
|
|
eventLog.MoveDown ();
|
|
|
|
Application.Top.SetScheme (
|
|
new (Application.Top.GetScheme ())
|
|
{
|
|
Normal = new (
|
|
Application.Top!.GetAttributeForRole (VisualRole.Normal).Foreground,
|
|
args.Result,
|
|
Application.Top!.GetAttributeForRole (VisualRole.Normal).Style)
|
|
});
|
|
}
|
|
};
|
|
bgColorShortcut.CommandView = bgColor;
|
|
|
|
Application.Top.Add (bgColorShortcut);
|
|
|
|
var appQuitShortcut = new Shortcut
|
|
{
|
|
Id = "appQuitShortcut",
|
|
X = Pos.Align (Alignment.Start, AlignmentModes.IgnoreFirstOrLast, 1),
|
|
Y = Pos.AnchorEnd () - 1,
|
|
Key = Key.Esc,
|
|
BindKeyToApplication = true,
|
|
Title = "Quit",
|
|
HelpText = "App Scope"
|
|
};
|
|
appQuitShortcut.Accepting += (o, args) => { Application.RequestStop (); };
|
|
|
|
Application.Top.Add (appQuitShortcut);
|
|
|
|
foreach (Shortcut shortcut in Application.Top.SubViews.OfType<Shortcut> ())
|
|
{
|
|
shortcut.Selecting += (o, args) =>
|
|
{
|
|
if (args.Handled)
|
|
{
|
|
return;
|
|
}
|
|
|
|
eventSource.Add ($"{shortcut!.Id}.Selecting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
|
|
eventLog.MoveDown ();
|
|
};
|
|
|
|
shortcut.CommandView.Selecting += (o, args) =>
|
|
{
|
|
if (args.Handled)
|
|
{
|
|
return;
|
|
}
|
|
|
|
eventSource.Add (
|
|
$"{shortcut!.Id}.CommandView.Selecting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
|
|
eventLog.MoveDown ();
|
|
args.Handled = true;
|
|
};
|
|
|
|
shortcut.Accepting += (o, args) =>
|
|
{
|
|
eventSource.Add ($"{shortcut!.Id}.Accepting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
|
|
eventLog.MoveDown ();
|
|
|
|
// We don't want this to exit the Scenario
|
|
args.Handled = true;
|
|
};
|
|
|
|
shortcut.CommandView.Accepting += (o, args) =>
|
|
{
|
|
eventSource.Add (
|
|
$"{shortcut!.Id}.CommandView.Accepting: {shortcut!.CommandView.Text} {shortcut!.CommandView.GetType ().Name}");
|
|
eventLog.MoveDown ();
|
|
};
|
|
}
|
|
}
|
|
|
|
private void Button_Clicked (object? sender, CommandEventArgs e)
|
|
{
|
|
e.Handled = true;
|
|
var view = sender as View;
|
|
MessageBox.Query ("Hi", $"You clicked {view?.Text}", "_Ok");
|
|
}
|
|
}
|