Merge branch 'gui-cs:v2_develop' into v2_develop

This commit is contained in:
Tig
2025-03-01 17:23:13 -07:00
committed by GitHub
2 changed files with 7 additions and 5 deletions

View File

@@ -231,14 +231,14 @@ internal class ConsoleDriverFacade<T> : IConsoleDriver, IConsoleDriverFacade
if (InputProcessor is WindowsInputProcessor) if (InputProcessor is WindowsInputProcessor)
{ {
type = "(win)"; type = "win";
} }
else if (InputProcessor is NetInputProcessor) else if (InputProcessor is NetInputProcessor)
{ {
type = "(net)"; type = "net";
} }
return GetType ().Name.TrimEnd ('`', '1') + type; return "v2" + type;
} }
/// <summary>Tests if the specified rune is supported by the driver.</summary> /// <summary>Tests if the specified rune is supported by the driver.</summary>

View File

@@ -147,8 +147,10 @@ public class UICatalogApp
// If no driver is provided, the default driver is used. // If no driver is provided, the default driver is used.
Option<string> driverOption = new Option<string> ("--driver", "The IConsoleDriver to use.").FromAmong ( Option<string> driverOption = new Option<string> ("--driver", "The IConsoleDriver to use.").FromAmong (
Application.GetDriverTypes () Application.GetDriverTypes ()
.Select (d => d!.Name) .Where (d=>!typeof (IConsoleDriverFacade).IsAssignableFrom (d))
.ToArray () .Select (d => d!.Name)
.Union (["v2","v2win","v2net"])
.ToArray ()
); );
driverOption.AddAlias ("-d"); driverOption.AddAlias ("-d");
driverOption.AddAlias ("--d"); driverOption.AddAlias ("--d");