mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2026-01-02 01:03:29 +01:00
* Added ClipRegion; cleaned up driver code * clip region unit tests * api docs * Moved color stuff from ConsoleDriver to Color.cs * Removes unused ConsoleDriver APIs * Code cleanup and Removes unused ConsoleDriver APIs * Code cleanup and Removes unused ConsoleDriver APIs * Work around https://github.com/gui-cs/Terminal.Gui/issues/2610 * adjusted unit tests * initial commit * Made Rows, Cols, Top, Left virtual * Made Clipboard non-virtual * Made EnableConsoleScrolling non-virtual * Made Contents non-virtual * Pulled Row/Col up * Made MoveTo virtual; fixed stupid FakeDriver cursor issue * Made CurrentAttribute non-virtual * Made SetAttribute non-virtual * Moved clipboard code out * Code cleanup * Removes dependecy on NStack from ConsoleDrivers - WIP * Fixed unit tests * Fixed unit tests * Added list of unit tests needed * Did some perf testing; tweaked code and charmap to address * Brough in code from PR #2264 (but commented) * Tons of code cleanup * Fighting with ScrollView * Fixing bugs * Fixed TabView tests * Fixed View.Visible test that was not really working * Fixed unit tests * Cleaned up clipboard APIs in attempt to track down unit test failure * Add Cut_Preserves_Selection test * Removed invalid code * Removed invalid test code; unit tests now pass * EscSeq* - Adjusted naming, added more sequences, made code more consistent, simplified, etc... * Added CSI_SetGraphicsRendition * NetDriver code cleanup * code cleanup * Cleaned up color handling in NetDriver * refixed tabview unit test * WindowsDriver color code cleanup * WindowsDriver color code cleanup * CursesDriver color code cleanup * CursesDriver - Adding _BOLD has no effect. Further up the stack we cast the return of ColorToCursesColor from int to short and the _BOLD values don't fit in a short. * CursesDriver color code - make code more accurate * CursesDriver color code - make code more accurate * Simplified ConsoleDriver.GetColors API * Simplified ConsoleDriver.GetColors API further * Improved encapslation of Attribute; prep for TrueColor & other attributes like blink * Fixes #2249. CharacterMap isn't refreshing well non-BMP code points on scroll. * Use GetRange to take some of the runes before convert to string. * Attempting to fix unit tests not being cleaned up * Fixes #2658 - ConsoleDriver.IsRuneSupported * Fixes #2658 - ConsoleDriver.IsRuneSupported (for WindowsDriver) * Check all the range values and not only the max value. * Reducing code. * Fixes #2674 - Unit test process doesn't exit * Changed Cell to support IsDirty and list of Runes * add support for rendering TrueColor output on Windows merging veeman & tznind code * add colorconverter changes * fixed merged v2_develop * Fixing merge bugs * Fixed merge bugs * Fixed merge bugs - all unit tests pass * Debugging netdriver * More netdriver diag * API docs for escutils * Update unicode scenario to stress more stuff * Contents: Now a 2D array of Cells; WIP * AddRune and ClearContents no longer virtual/abstract * WindowsDriver renders correctly again * Progress on Curses * Progress on Curses * broke windowsdriver * Cleaned up FakeMainLoop * Cleaned up some build warnings * Removed _init from AutoInitShutdown as it's not needed anymore * Removed unused var * Removed unused var * Fixed nullabiltiy warning in LineCanvas * Fixed charmap crash * Fixes #2758 in v2 * Port testonfail fix to v2 * Remove EnableConsoleScrolling * Backport #2764 from develop (clear last line) * Remove uneeded usings * Progress on unicode * Merged in changes from PR #2786, Fixes #2784 * revamp charmap rendering * Charmap option to show glyph widths * Fixed issue with wide glpyhs being overwritten * Fixed charmap startcodepoint change issue * Added abiltiy to see ncurses verison/lib * Fought with CursesDriver; giving up for now. See notes. * Leverage Wcwidth nuget library instaed of our own tables * enhanced charmap Details dialog * Final attempt at fixing curses --------- Co-authored-by: BDisp <bd.bdisp@gmail.com> Co-authored-by: adstep <stephensonadamj@gmail.com>
201 lines
5.1 KiB
C#
201 lines
5.1 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using Terminal.Gui;
|
|
using Attribute = Terminal.Gui.Attribute;
|
|
|
|
namespace UICatalog.Scenarios {
|
|
|
|
[ScenarioMetadata (Name: "Line Drawing", Description: "Demonstrates LineCanvas.")]
|
|
[ScenarioCategory ("Controls")]
|
|
[ScenarioCategory ("Layout")]
|
|
public class LineDrawing : Scenario {
|
|
|
|
public override void Setup ()
|
|
{
|
|
var canvas = new DrawingArea {
|
|
X = 0,
|
|
Y = 0,
|
|
Width = Dim.Fill (),
|
|
Height = Dim.Fill ()
|
|
};
|
|
|
|
var tools = new ToolsView () {
|
|
Title = "Tools",
|
|
X = Pos.Right (canvas) - 20,
|
|
Y = 2
|
|
};
|
|
|
|
tools.ColorChanged += (c) => canvas.SetColor (c);
|
|
tools.SetStyle += (b) => canvas.LineStyle = b;
|
|
tools.AddLayer += () => canvas.AddLayer ();
|
|
|
|
Win.Add (canvas);
|
|
Win.Add (tools);
|
|
|
|
Win.KeyPress += (s,e) => { e.Handled = canvas.ProcessKey (e.KeyEvent); };
|
|
}
|
|
|
|
class ToolsView : Window {
|
|
public event Action<Color> ColorChanged;
|
|
public event Action<LineStyle> SetStyle;
|
|
public event Action AddLayer;
|
|
|
|
private RadioGroup _stylePicker;
|
|
private ColorPicker _colorPicker;
|
|
private Button _addLayerBtn;
|
|
|
|
public ToolsView ()
|
|
{
|
|
BorderStyle = LineStyle.Dotted;
|
|
Border.Thickness = new Thickness (1, 2, 1, 1);
|
|
Initialized += ToolsView_Initialized;
|
|
}
|
|
|
|
private void ToolsView_Initialized (object sender, EventArgs e)
|
|
{
|
|
LayoutSubviews ();
|
|
Width = Math.Max (_colorPicker.Frame.Width, _stylePicker.Frame.Width) + GetFramesThickness ().Horizontal;
|
|
Height = _colorPicker.Frame.Height + _stylePicker.Frame.Height + _addLayerBtn.Frame.Height + GetFramesThickness ().Vertical;
|
|
SuperView.LayoutSubviews ();
|
|
}
|
|
|
|
public override void BeginInit ()
|
|
{
|
|
base.BeginInit ();
|
|
|
|
_colorPicker = new ColorPicker () {
|
|
X = 0,
|
|
Y = 0,
|
|
BoxHeight = 1,
|
|
BoxWidth = 2
|
|
};
|
|
|
|
_colorPicker.ColorChanged += (s, a) => ColorChanged?.Invoke (a.Color);
|
|
|
|
_stylePicker = new RadioGroup (Enum.GetNames (typeof (LineStyle)).ToArray ()) {
|
|
X = 0,
|
|
Y = Pos.Bottom (_colorPicker)
|
|
};
|
|
|
|
_stylePicker.SelectedItemChanged += (s, a) => {
|
|
SetStyle?.Invoke ((LineStyle)a.SelectedItem);
|
|
};
|
|
|
|
_addLayerBtn = new Button () {
|
|
Text = "New Layer",
|
|
X = Pos.Center (),
|
|
Y = Pos.Bottom (_stylePicker),
|
|
};
|
|
|
|
_addLayerBtn.Clicked += (s, a) => AddLayer?.Invoke ();
|
|
Add (_colorPicker, _stylePicker, _addLayerBtn);
|
|
}
|
|
}
|
|
|
|
class DrawingArea : View {
|
|
List<LineCanvas> _layers = new List<LineCanvas> ();
|
|
LineCanvas _currentLayer;
|
|
Color _currentColor = Color.White;
|
|
StraightLine _currentLine = null;
|
|
|
|
public LineStyle LineStyle { get; set; }
|
|
|
|
public DrawingArea ()
|
|
{
|
|
AddLayer ();
|
|
}
|
|
|
|
Stack<StraightLine> undoHistory = new ();
|
|
|
|
public override bool ProcessKey (KeyEvent e)
|
|
{
|
|
if (e.Key == (Key.Z | Key.CtrlMask)) {
|
|
var pop = _currentLayer.RemoveLastLine ();
|
|
if(pop != null) {
|
|
undoHistory.Push (pop);
|
|
SetNeedsDisplay ();
|
|
return true;
|
|
}
|
|
}
|
|
|
|
if (e.Key == (Key.Y | Key.CtrlMask)) {
|
|
if (undoHistory.Any()) {
|
|
var pop = undoHistory.Pop ();
|
|
_currentLayer.AddLine(pop);
|
|
SetNeedsDisplay ();
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return base.ProcessKey (e);
|
|
}
|
|
internal void AddLayer ()
|
|
{
|
|
_currentLayer = new LineCanvas ();
|
|
_layers.Add (_currentLayer);
|
|
}
|
|
|
|
public override void OnDrawContentComplete (Rect contentArea)
|
|
{
|
|
base.OnDrawContentComplete (contentArea);
|
|
foreach (var canvas in _layers) {
|
|
|
|
foreach (var c in canvas.GetCellMap ()) {
|
|
Driver.SetAttribute (c.Value.Attribute ?? ColorScheme.Normal);
|
|
// TODO: #2616 - Support combining sequences that don't normalize
|
|
this.AddRune (c.Key.X, c.Key.Y, c.Value.Runes [0]);
|
|
}
|
|
}
|
|
}
|
|
|
|
public override bool OnMouseEvent (MouseEvent mouseEvent)
|
|
{
|
|
if (mouseEvent.Flags.HasFlag (MouseFlags.Button1Pressed)) {
|
|
if (_currentLine == null) {
|
|
|
|
_currentLine = new StraightLine (
|
|
new Point (mouseEvent.X - GetBoundsOffset ().X, mouseEvent.Y - GetBoundsOffset ().X),
|
|
0, Orientation.Vertical, LineStyle, new Attribute (_currentColor, GetNormalColor ().Background));
|
|
_currentLayer.AddLine (_currentLine);
|
|
} else {
|
|
var start = _currentLine.Start;
|
|
var end = new Point (mouseEvent.X - GetBoundsOffset ().X, mouseEvent.Y - GetBoundsOffset ().Y);
|
|
var orientation = Orientation.Vertical;
|
|
var length = end.Y - start.Y;
|
|
|
|
// if line is wider than it is tall switch to horizontal
|
|
if (Math.Abs (start.X - end.X) > Math.Abs (start.Y - end.Y)) {
|
|
orientation = Orientation.Horizontal;
|
|
length = end.X - start.X;
|
|
}
|
|
|
|
if (length > 0) {
|
|
length++;
|
|
} else {
|
|
length--;
|
|
}
|
|
_currentLine.Length = length;
|
|
_currentLine.Orientation = orientation;
|
|
_currentLayer.ClearCache ();
|
|
SetNeedsDisplay ();
|
|
}
|
|
} else {
|
|
if (_currentLine != null) {
|
|
_currentLine = null;
|
|
undoHistory.Clear ();
|
|
SetNeedsDisplay ();
|
|
}
|
|
}
|
|
|
|
return base.OnMouseEvent (mouseEvent);
|
|
}
|
|
|
|
internal void SetColor (Color c)
|
|
{
|
|
_currentColor = c;
|
|
}
|
|
}
|
|
}
|
|
}
|