From 81ad695ef72fa3c95313e2689454e6b761d74f30 Mon Sep 17 00:00:00 2001 From: Thomas Nind <31306100+tznind@users.noreply.github.com> Date: Sun, 12 Jan 2025 17:05:52 +0000 Subject: [PATCH 1/4] Fix foreach runes bug with unicode surrogate pairs (#3894) --- Terminal.Gui/Text/TextFormatter.cs | 2 +- UnitTests/Views/LabelTests.cs | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Terminal.Gui/Text/TextFormatter.cs b/Terminal.Gui/Text/TextFormatter.cs index a4a8b7060..f426d7659 100644 --- a/Terminal.Gui/Text/TextFormatter.cs +++ b/Terminal.Gui/Text/TextFormatter.cs @@ -2124,7 +2124,7 @@ public class TextFormatter var start = string.Empty; var i = 0; - foreach (Rune c in text) + foreach (Rune c in text.EnumerateRunes ()) { if (c == hotKeySpecifier && i == hotPos) { diff --git a/UnitTests/Views/LabelTests.cs b/UnitTests/Views/LabelTests.cs index c58be7974..b798fbe80 100644 --- a/UnitTests/Views/LabelTests.cs +++ b/UnitTests/Views/LabelTests.cs @@ -1460,4 +1460,16 @@ e Application.Top.Dispose (); Application.ResetState (); } + + // https://github.com/gui-cs/Terminal.Gui/issues/3893 + [Fact] + [SetupFakeDriver] + public void TestLabelUnderscoreMinus () + { + var lbl = new Label () + { + Text = "TextView with some more test_- text. Unicode shouldn't 𝔹Aℝ𝔽!" + }; + lbl.Draw (); + } } From da2d20e488bea690a411f1489f64968185100f84 Mon Sep 17 00:00:00 2001 From: "Rishikeshan Sulochana/Lavakumar (Work)" <92720632+ris-work@users.noreply.github.com> Date: Wed, 5 Feb 2025 22:32:51 +0530 Subject: [PATCH 2/4] Add Terminal.Gui Designer (#3902) Terminal.Gui Designer is special in the sense it is also a good companion tool, especially for rapid prototyping and for beginners. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f424e6aec..a6b1ca97b 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,8 @@ cd myproj dotnet run ``` +There is also a [visual designer](https://github.com/gui-cs/TerminalGuiDesigner) (uses Terminal.Gui itself). + ## Documentation * [Getting Started](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/getting-started.html) From dc004c492349403f4ad537e20fa9e9d604564985 Mon Sep 17 00:00:00 2001 From: "Rishikeshan Sulochana/Lavakumar (Work)" <92720632+ris-work@users.noreply.github.com> Date: Wed, 5 Feb 2025 22:33:35 +0530 Subject: [PATCH 3/4] (Minor fix) Fix the link text, refer to the F# example too (#3901) The sample code was removed and was replaced with a link; the markup was bleeding. Co-authored-by: Tig --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a6b1ca97b..e82ec4c30 100644 --- a/README.md +++ b/README.md @@ -49,14 +49,16 @@ The team is looking forward to seeing new amazing projects made by the community ## Sample Usage in C# -The following example shows a basic Terminal.Gui application in C#: - -[!code-csharp[](./Example/Example.cs)] +The following example shows a basic Terminal.Gui application in C#: +[Example (source)](./Example/Example.cs) When run the application looks as follows: ![Simple Usage app](./docfx/images/Example.png) +## Sample usage in F# +F# examples are located [here](./FSharpExample/Program.fs) + ## Installing Use NuGet to install the `Terminal.Gui` NuGet package: https://www.nuget.org/packages/Terminal.Gui From 6fcd5efa6a74d9d0009b8c5557ca367943ec0dae Mon Sep 17 00:00:00 2001 From: Tig Date: Tue, 18 Feb 2025 14:48:16 -0800 Subject: [PATCH 4/4] Update GitVersion.yml (#3911) --- GitVersion.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 1946a6c7a..09fb21bd2 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -4,7 +4,7 @@ continuous-delivery-fallback-tag: dev branches: v2_develop: mode: ContinuousDeployment - tag: dev + tag: v2_develop regex: ^v2_develop?[/-] tracks-release-branches: true is-source-branch-for: ['v2_release'] @@ -19,7 +19,7 @@ branches: v1_develop: mode: ContinuousDeployment - tag: dev + tag: v1_develop regex: v1_develop source-branches: - v1_release