Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-02 01:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolving merge conflicts

Browse Source
This commit is contained in:
BDisp
2025-11-12 15:25:29 +00:00
parent 012356eaeb
commit 87ea2af9bf
49 changed files with 2374 additions and 2030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Examples/UICatalog/Scenarios/CombiningMarks.cs
View File

@@ -16,7 +16,8 @@ public class CombiningMarks : Scenario
Application.Top!.SetNeedsDraw ();
var i = -1;
top.AddStr ("Terminal.Gui only supports combining marks that normalize. See Issue #2616.");
top.Move (0, ++i);
top.AddStr ("Terminal.Gui supports all combining sequences that can be rendered as an unique grapheme.");
top.Move (0, ++i);
top.AddStr ("\u0301<- \"\\u0301\" using AddStr.");
top.Move (0, ++i);
@@ -38,7 +39,7 @@ public class CombiningMarks : Scenario
top.AddRune ('\u0301');
top.AddRune ('\u0328');
top.AddRune (']');
top.AddStr ("<- \"[a\\u0301\\u0301\\u0328]\" using AddRune for each.");
top.AddStr ("<- \"[a\\u0301\\u0301\\u0328]\" using AddRune for each. Avoid use AddRune for combining sequences because may result with empty blocks at end.");
top.Move (0, ++i);
top.AddStr ("[a\u0301\u0301\u0328]<- \"[a\\u0301\\u0301\\u0328]\" using AddStr.");
top.Move (0, ++i);
@@ -82,6 +83,12 @@ public class CombiningMarks : Scenario
top.AddStr ("[\U0001F468\U0001F469\U0001F9D2]<- \"[\\U0001F468\\U0001F469\\U0001F9D2]\" using AddStr.");
top.Move (0, ++i);
top.AddStr ("[\U0001F468\u200D\U0001F469\u200D\U0001F9D2]<- \"[\\U0001F468\\u200D\\U0001F469\\u200D\\U0001F9D2]\" using AddStr.");
top.Move (0, ++i);
top.AddStr ("[\U0001F468\u200D\U0001F469\u200D\U0001F467\u200D\U0001F466]<- \"[\\U0001F468\\u200D\\U0001F469\\u200D\\U0001F467\\u200D\\U0001F466]\" using AddStr.");
top.Move (0, ++i);
top.AddStr ("[\u0e32\u0e33]<- \"[\\u0e32\\u0e33]\" using AddStr.");
top.Move (0, ++i);
top.AddStr ("[\U0001F469\u200D\u2764\uFE0F\u200D\U0001F48B\u200D\U0001F468]<- \"[\\U0001F469\\u200D\\u2764\\uFE0F\\u200D\\U0001F48B\\u200D\\U0001F468]\" using AddStr.");
};
Application.Run (top);

2
Examples/UICatalog/Scenarios/LineDrawing.cs
View File

@@ -284,7 +284,7 @@ public class DrawingArea : View
SetCurrentAttribute (c.Value.Value.Attribute ?? GetAttributeForRole (VisualRole.Normal));
// TODO: #2616 - Support combining sequences that don't normalize
AddRune (c.Key.X, c.Key.Y, c.Value.Value.Rune);
AddStr (c.Key.X, c.Key.Y, c.Value.Value.Grapheme);
}
}
}

16
Examples/UICatalog/Scenarios/Sliders.cs
View File

@@ -86,17 +86,17 @@ public class Sliders : Scenario
{
if (single.Orientation == Orientation.Horizontal)
{
single.Style.SpaceChar = new () { Rune = Glyphs.HLine };
single.Style.OptionChar = new () { Rune = Glyphs.HLine };
single.Style.SpaceChar = new () { Grapheme = Glyphs.HLine.ToString () };
single.Style.OptionChar = new () { Grapheme = Glyphs.HLine.ToString () };
}
else
{
single.Style.SpaceChar = new () { Rune = Glyphs.VLine };
single.Style.OptionChar = new () { Rune = Glyphs.VLine };
single.Style.SpaceChar = new () { Grapheme = Glyphs.VLine.ToString () };
single.Style.OptionChar = new () { Grapheme = Glyphs.VLine.ToString () };
}
};
single.Style.SetChar = new () { Rune = Glyphs.ContinuousMeterSegment };
single.Style.DragChar = new () { Rune = Glyphs.ContinuousMeterSegment };
single.Style.SetChar = new () { Grapheme = Glyphs.ContinuousMeterSegment.ToString () };
single.Style.DragChar = new () { Grapheme = Glyphs.ContinuousMeterSegment.ToString () };
v.Add (single);
@@ -257,7 +257,7 @@ public class Sliders : Scenario
{
s.Orientation = Orientation.Horizontal;
s.Style.SpaceChar = new () { Rune = Glyphs.HLine };
s.Style.SpaceChar = new () { Grapheme = Glyphs.HLine.ToString () };
if (prev == null)
{
@@ -275,7 +275,7 @@ public class Sliders : Scenario
{
s.Orientation = Orientation.Vertical;
s.Style.SpaceChar = new () { Rune = Glyphs.VLine };
s.Style.SpaceChar = new () { Grapheme = Glyphs.VLine.ToString () };
if (prev == null)
{

11
Examples/UICatalog/Scenarios/SyntaxHighlighting.cs
View File

@@ -152,12 +152,12 @@ public class SyntaxHighlighting : Scenario
),
null,
new (
"_Load Rune Cells",
"_Load Text Cells",
"",
() => ApplyLoadCells ()
),
new (
"_Save Rune Cells",
"_Save Text Cells",
"",
() => SaveCells ()
),
@@ -240,12 +240,9 @@ public class SyntaxHighlighting : Scenario
{
string csName = color.Key;
foreach (Rune rune in csName.EnumerateRunes ())
{
cells.Add (new () { Rune = rune, Attribute = color.Value.Normal });
}
cells.AddRange (Cell.ToCellList (csName, color.Value.Normal));
cells.Add (new () { Rune = (Rune)'\n', Attribute = color.Value.Focus });
cells.Add (new () { Grapheme = "\n", Attribute = color.Value.Focus });
}
if (File.Exists (_path))