Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1231. Ignoring negative bounds. (#1232)

Browse Source 
* Fixes #1231. Ignoring negative bounds.

* Added vertical width instead VerticalTextAlignment.

* Removing width.
This commit is contained in:
BDisp
2021-04-20 22:17:53 +01:00
committed by GitHub
parent db3ddab2b8
commit 4948d072b0
2 changed files with 67 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Terminal.Gui/Core/TextFormatter.cs
View File

@@ -877,6 +877,9 @@ namespace Terminal.Gui {
var current = start;
for (var idx = start; idx < start + size; idx++) {
if (idx < 0) {
continue;
}
var rune = (Rune)' ';
if (isVertical) {
Application.Driver?.Move (x, current);

77
UnitTests/TextFormatterTests.cs
View File

@@ -7,7 +7,7 @@ using System.Linq;
using Terminal.Gui;
using Xunit;
// Alais Console to MockConsole so we don't accidentally use Console
// Alias Console to MockConsole so we don't accidentally use Console
using Console = Terminal.Gui.FakeConsole;
namespace Terminal.Gui {
@@ -16,7 +16,7 @@ namespace Terminal.Gui {
[Fact]
public void Basic_Usage ()
{
var testText = ustring.Make("test");
var testText = ustring.Make ("test");
var expectedSize = new Size ();
var testBounds = new Rect (0, 0, 100, 1);
var tf = new TextFormatter ();
@@ -26,7 +26,7 @@ namespace Terminal.Gui {
Assert.Equal (testText, tf.Text);
Assert.Equal (TextAlignment.Left, tf.Alignment);
Assert.Equal (expectedSize, tf.Size);
tf.Draw (testBounds, new Attribute(), new Attribute());
tf.Draw (testBounds, new Attribute (), new Attribute ());
Assert.Equal (expectedSize, tf.Size);
Assert.NotEmpty (tf.Lines);
@@ -76,7 +76,7 @@ namespace Terminal.Gui {
Assert.False (tf.NeedsFormat);
tf.Size = new Size (1, 1);
Assert.True (tf.NeedsFormat);
Assert.True (tf.NeedsFormat);
Assert.NotEmpty (tf.Lines);
Assert.False (tf.NeedsFormat); // get_Lines causes a Format
@@ -1961,7 +1961,7 @@ namespace Terminal.Gui {
expectedClippedWidth = Math.Min (text.RuneCount, maxWidth);
list = TextFormatter.Format (text, maxWidth, TextAlignment.Left, wrap);
Assert.True (list.Count == 1);
Assert.Equal (ustring.Make (text.ToRunes () [0..expectedClippedWidth]), list[0]);
Assert.Equal (ustring.Make (text.ToRunes () [0..expectedClippedWidth]), list [0]);
maxWidth = text.RuneCount - 1;
expectedClippedWidth = Math.Min (text.RuneCount, maxWidth);
@@ -2011,10 +2011,10 @@ namespace Terminal.Gui {
Assert.Equal (ustring.Make (text.ToRunes () [0..expectedClippedWidth]), list [0]);
maxWidth = text.RuneCount - 1;
expectedClippedWidth = Math.Min (text.RuneCount, maxWidth);
expectedClippedWidth = Math.Min (text.RuneCount, maxWidth);
list = TextFormatter.Format (text, maxWidth, TextAlignment.Left, wrap);
Assert.True (list.Count == 1);
Assert.Equal (ustring.Make (text.ToRunes () [0..expectedClippedWidth]).Replace("\n", " "), list [0]);
Assert.Equal (ustring.Make (text.ToRunes () [0..expectedClippedWidth]).Replace ("\n", " "), list [0]);
// no clip
maxWidth = text.RuneCount + 0;
@@ -2051,7 +2051,7 @@ namespace Terminal.Gui {
expectedClippedWidth = Math.Min (text.RuneCount, maxWidth) + 1;
list = TextFormatter.Format (text, maxWidth, TextAlignment.Left, wrap);
Assert.True (list.Count == 1);
Assert.Equal (ustring.Make (text.ToRunes () [0..expectedClippedWidth]).Replace ("\r\n", " ").ToString(), list [0].ToString());
Assert.Equal (ustring.Make (text.ToRunes () [0..expectedClippedWidth]).Replace ("\r\n", " ").ToString (), list [0].ToString ());
// no clip
maxWidth = text.RuneCount + 0;
@@ -2145,7 +2145,6 @@ namespace Terminal.Gui {
list = TextFormatter.Format (text, maxWidth, TextAlignment.Left, wrap);
Assert.True (list.Count == 1);
Assert.Equal ("012 456 89 end", list [0]);
}
[Fact]
@@ -2295,16 +2294,16 @@ namespace Terminal.Gui {
Assert.Equal (1, c.Utf8SequenceLength);
c = new System.Text.Rune ('\u1150');
Assert.Equal (3, c.Utf8SequenceLength); // 0x1150 ᅐ Unicode Technical Report #11
Assert.Equal (3, c.Utf8SequenceLength); // 0x1150 ᅐ Unicode Technical Report #11
c = new System.Text.Rune ('\u1161');
Assert.Equal (3, c.Utf8SequenceLength); // 0x1161 ᅡ column width of 0
Assert.Equal (3, c.Utf8SequenceLength); // 0x1161 ᅡ column width of 0
c = new System.Text.Rune (31);
Assert.Equal (1, c.Utf8SequenceLength); // non printable character
Assert.Equal (1, c.Utf8SequenceLength); // non printable character
c = new System.Text.Rune (127);
Assert.Equal (1, c.Utf8SequenceLength); // non printable character
Assert.Equal (1, c.Utf8SequenceLength); // non printable character
}
[Fact]
@@ -2426,5 +2425,57 @@ namespace Terminal.Gui {
{
Assert.Throws<ArgumentException> (() => TextFormatter.Format ("Some text", 4, TextAlignment.Left, false, true));
}
[Fact]
public void Draw_Horizontal_Throws_IndexOutOfRangeException_With_Negative_Bounds ()
{
Application.Init (new FakeDriver (), new FakeMainLoop (() => FakeConsole.ReadKey (true)));
var top = Application.Top;
var view = new View ("view") { X = -2 };
top.Add (view);
Application.Iteration += () => {
Assert.Equal (-2, view.X);
Application.RequestStop ();
};
try {
Application.Run ();
} catch (IndexOutOfRangeException ex) {
// After the fix this exception will not be caught.
Assert.IsType<IndexOutOfRangeException> (ex);
}
}
[Fact]
public void Draw_Vertical_Throws_IndexOutOfRangeException_With_Negative_Bounds ()
{
Application.Init (new FakeDriver (), new FakeMainLoop (() => FakeConsole.ReadKey (true)));
var top = Application.Top;
var view = new View ("view") {
Y = -2,
Height = 10,
TextDirection = TextDirection.TopBottom_LeftRight
};
top.Add (view);
Application.Iteration += () => {
Assert.Equal (-2, view.Y);
Application.RequestStop ();
};
try {
Application.Run ();
} catch (IndexOutOfRangeException ex) {
// After the fix this exception will not be caught.
Assert.IsType<IndexOutOfRangeException> (ex);
}
}
}
}