From 82b1dfbfb925e1abfdb0a93ef2e3841a8b069177 Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Thu, 17 Aug 2023 13:04:34 -0600 Subject: [PATCH] backs out using _isWindowsTerminal for truecolor check --- Terminal.Gui/ConsoleDrivers/WindowsDriver.cs | 2 +- UICatalog/.editorconfig | 23 -------------------- UICatalog/Properties/launchSettings.json | 5 ++++- 3 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 UICatalog/.editorconfig diff --git a/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs b/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs index 6b2178a6a..f1f0646dc 100644 --- a/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs +++ b/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs @@ -777,7 +777,7 @@ internal class WindowsDriver : ConsoleDriver { public WindowsConsole WinConsole { get; private set; } - public override bool SupportsTrueColor => RunningUnitTests || (_isWindowsTerminal && Environment.OSVersion.Version.Build >= 14931); + public override bool SupportsTrueColor => RunningUnitTests || (Environment.OSVersion.Version.Build >= 14931); public override bool Force16Colors { get => base.Force16Colors; diff --git a/UICatalog/.editorconfig b/UICatalog/.editorconfig deleted file mode 100644 index 040e7abd9..000000000 --- a/UICatalog/.editorconfig +++ /dev/null @@ -1,23 +0,0 @@ -[*.cs] -indent_style = tab -indent_size = 8 -tab_width = 8 -csharp_new_line_before_open_brace = methods,local_functions -csharp_new_line_before_else = false -csharp_new_line_before_catch = false -csharp_new_line_before_finally = false -end_of_line = crlf - -csharp_indent_case_contents = true -csharp_indent_switch_labels = false -csharp_indent_labels = flush_left -csharp_space_after_keywords_in_control_flow_statements = true -csharp_space_between_method_declaration_parameter_list_parentheses = false -csharp_space_between_method_call_parameter_list_parentheses = false -csharp_preserve_single_line_blocks = true -dotnet_style_require_accessibility_modifiers = never -csharp_style_var_when_type_is_apparent = true -csharp_prefer_braces = false -csharp_space_before_open_square_brackets = true -csharp_space_between_method_call_name_and_opening_parenthesis = true -csharp_space_between_method_declaration_name_and_open_parenthesis = true \ No newline at end of file diff --git a/UICatalog/Properties/launchSettings.json b/UICatalog/Properties/launchSettings.json index 00e9d9e71..0325ebcb2 100644 --- a/UICatalog/Properties/launchSettings.json +++ b/UICatalog/Properties/launchSettings.json @@ -1,7 +1,10 @@ { "profiles": { "UICatalog": { - "commandName": "Project" + "commandName": "Project", + "environmentVariables": { + "WT_SESSION": "1" + } }, "WSL : UICatalog": { "commandName": "Executable",