Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Examples/Example/Example.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

using Terminal.Gui.App;
using Terminal.Gui.Configuration;
using Terminal.Gui.Input;
using Terminal.Gui.ViewBase;
using Terminal.Gui.Views;
using Terminal.Gui.Input;

// Override the default configuration for the application to use the Amber Phosphor theme
ConfigurationManager.RuntimeConfig = """{ "Theme": "Amber Phosphor" }""";
Expand Down
7 changes: 0 additions & 7 deletions Terminal.sln
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScenarioRunner", "Examples\
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A589126F-C71A-4FEE-B7EA-2DCA1ADF6A46}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShortcutTest", "Examples\ShortcutTest\ShortcutTest.csproj", "{0EECEC4F-AD8D-1076-1B40-562926DE1CB3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -239,10 +237,6 @@ Global
{DB0337E6-BBC0-4ECB-9F18-F7310705BDAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DB0337E6-BBC0-4ECB-9F18-F7310705BDAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DB0337E6-BBC0-4ECB-9F18-F7310705BDAF}.Release|Any CPU.Build.0 = Release|Any CPU
{0EECEC4F-AD8D-1076-1B40-562926DE1CB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0EECEC4F-AD8D-1076-1B40-562926DE1CB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0EECEC4F-AD8D-1076-1B40-562926DE1CB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0EECEC4F-AD8D-1076-1B40-562926DE1CB3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -270,7 +264,6 @@ Global
{26FDEE3C-9D1F-79A6-F48F-D0944C7F09F8} = {3DD033C0-E023-47BF-A808-9CCE30873C3E}
{566AFB59-FF8C-FFF4-C1F4-049B6246E4A7} = {3DD033C0-E023-47BF-A808-9CCE30873C3E}
{DB0337E6-BBC0-4ECB-9F18-F7310705BDAF} = {3DD033C0-E023-47BF-A808-9CCE30873C3E}
{0EECEC4F-AD8D-1076-1B40-562926DE1CB3} = {3DD033C0-E023-47BF-A808-9CCE30873C3E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9F8F8A4D-7B8D-4C2A-AC5E-CD7117F74C03}
Expand Down
18 changes: 10 additions & 8 deletions docfx/scripts/OutputView/OutputView.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#nullable enable
using AnsiConsoleToHtml;
using Terminal.Gui.App;
using Terminal.Gui.Drivers;
using Terminal.Gui.Configuration;
using Terminal.Gui.Drawing;
using Terminal.Gui.Drivers;
using Terminal.Gui.ViewBase;
using Terminal.Gui.Views;
using Attribute = Terminal.Gui.Drawing.Attribute;
Expand Down Expand Up @@ -30,8 +31,8 @@
string? outputFile = null;

string [] commandArgs = Environment.GetCommandLineArgs ();
bool ansi = false;
bool addBorderFrame = false;
var ansi = false;
var addBorderFrame = false;
Comment thread
tig marked this conversation as resolved.

for (var i = 0; i < commandArgs.Length; i++)
{
Expand Down Expand Up @@ -79,7 +80,7 @@
app.Driver!.Force16Colors = !ansi;
app.Driver!.SetScreenSize (80, 20);

string? result = app.Run<ViewDemoWindow> ().GetResult<string> ();
var result = app.Run<ViewDemoWindow> ().GetResult<string> ();
Comment thread
tig marked this conversation as resolved.
Outdated

if (result is { })
{
Expand All @@ -103,7 +104,7 @@

if (ansi)
{
output = AnsiConsoleToHtml.AnsiConsole.ToHtml (output);
output = AnsiConsole.ToHtml (output);
}

// Write to file or console
Expand All @@ -128,13 +129,13 @@ public ViewDemoWindow ()
Height = 20;

// Use only white on black
SetScheme (new (new Attribute (ColorName16.White, ColorName16.Black)));
SetScheme (new Scheme (new Attribute (ColorName16.White, ColorName16.Black)));
BorderStyle = LineStyle.None;
}

public static bool AddBorderFrame { get; set; }

/// <inheritdoc />
/// <inheritdoc/>
protected override void OnIsRunningChanged (bool newIsRunning)
{
base.OnIsRunningChanged (newIsRunning);
Expand All @@ -145,7 +146,7 @@ protected override void OnIsRunningChanged (bool newIsRunning)
}

// Convert ViewName to type that's in the Terminal.Gui assembly:
Type? type = Type.GetType ($"Terminal.Gui.Views.{ViewName!}, Terminal.Gui", false, true);
var type = Type.GetType ($"Terminal.Gui.Views.{ViewName!}, Terminal.Gui", false, true);
Comment thread
tig marked this conversation as resolved.
Outdated

if (type is null)
{
Expand Down Expand Up @@ -218,6 +219,7 @@ protected override void OnIsRunningChanged (bool newIsRunning)
{
view.Text = "This is some demo text.";
}

//view.Title = $"View: {type.Name}";

return view;
Expand Down
2 changes: 1 addition & 1 deletion docfx/scripts/OutputView/Properties/launchSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"OutputView ": {
"commandName": "Project",
"commandLineArgs": "--view=GraphView"
"commandLineArgs": "--view=AttributePicker"
},
"OutputView --ansi": {
"commandName": "Project",
Expand Down
239 changes: 0 additions & 239 deletions plans/fix-border-subview-linecanvas-clipping.md

This file was deleted.

Loading
Loading