diff --git a/Terminal.Gui/Drawing/Aligner.cs b/Terminal.Gui/Drawing/Aligner.cs index 158a0dc49..b230d1352 100644 --- a/Terminal.Gui/Drawing/Aligner.cs +++ b/Terminal.Gui/Drawing/Aligner.cs @@ -114,8 +114,7 @@ public class Aligner : INotifyPropertyChanged switch (alignment) { - case Alignment.Left: - case Alignment.Top: + case Alignment.Start: var currentPosition = 0; for (var i = 0; i < sizes.Length; i++) @@ -137,9 +136,7 @@ public class Aligner : INotifyPropertyChanged break; - case Alignment.Right: - case Alignment.Bottom: - + case Alignment.End: currentPosition = containerSize - totalItemsSize - spaces; for (var i = 0; i < sizes.Length; i++) @@ -153,7 +150,7 @@ public class Aligner : INotifyPropertyChanged break; - case Alignment.Centered: + case Alignment.Center: if (sizes.Length > 1) { // remaining space to be distributed before first and after the items @@ -184,7 +181,7 @@ public class Aligner : INotifyPropertyChanged break; - case Alignment.Justified: + case Alignment.Fill: int spaceBetween = sizes.Length > 1 ? (containerSize - totalItemsSize) / (sizes.Length - 1) : 0; int remainder = sizes.Length > 1 ? (containerSize - totalItemsSize) % (sizes.Length - 1) : 0; currentPosition = 0; @@ -200,8 +197,7 @@ public class Aligner : INotifyPropertyChanged break; // 111 2222 33333 - case Alignment.LastRightRestLeft: - case Alignment.LastBottomRestTop: + case Alignment.LastEndRestStart: if (sizes.Length > 1) { if (totalItemsSize > containerSize) @@ -238,8 +234,7 @@ public class Aligner : INotifyPropertyChanged break; // 111 2222 33333 - case Alignment.FirstLeftRestRight: - case Alignment.FirstTopRestBottom: + case Alignment.FirstStartRestEnd: if (sizes.Length > 1) { currentPosition = 0; diff --git a/Terminal.Gui/Drawing/Alignment.cs b/Terminal.Gui/Drawing/Alignment.cs index 917d32394..ba38eb907 100644 --- a/Terminal.Gui/Drawing/Alignment.cs +++ b/Terminal.Gui/Drawing/Alignment.cs @@ -1,191 +1,104 @@ namespace Terminal.Gui; /// -/// Controls how the aligns items within a container. +/// Determines the position of items when arranged in a container. /// public enum Alignment { /// - /// The items will be aligned to the left. - /// Set to to ensure at least one space between - /// each item. + /// The items will be aligned to the start (left or top) of the container. /// /// /// - /// If the container is smaller than the total size of the items, the right items will be clipped (their locations + /// If the container is smaller than the total size of the items, the end items will be clipped (their locations /// will be greater than the container size). /// - /// - /// and have equivalent behavior. - /// /// /// /// - /// 111 2222 33333 + /// |111 2222 33333 | /// /// - Left = 0, + Start = 0, /// - /// The items will be aligned to the top. - /// Set to to ensure at least one line between - /// each item. + /// The items will be aligned to the end (right or bottom) of the container. /// /// /// - /// If the container is smaller than the total size of the items, the bottom items will be clipped (their locations - /// will be greater than the container size). - /// - /// - /// and have equivalent behavior. - /// - /// - Top, - - /// - /// The items will be aligned to the right. - /// Set to to ensure at least one space between - /// each item. - /// - /// - /// - /// If the container is smaller than the total size of the items, the left items will be clipped (their locations + /// If the container is smaller than the total size of the items, the start items will be clipped (their locations /// will be negative). /// - /// - /// and have equivalent behavior. - /// /// /// /// - /// 111 2222 33333 + /// | 111 2222 33333| /// /// - Right, + End, /// - /// The items will be aligned to the bottom. - /// Set to to ensure at least one line between - /// each item. + /// Center in the available space. /// /// /// - /// If the container is smaller than the total size of the items, the top items will be clipped (their locations - /// will be negative). - /// - /// - /// and have equivalent behavior. - /// - /// - Bottom, - - /// - /// The group will be centered in the container. /// If centering is not possible, the group will be left-aligned. - /// Set to to ensure at least one space between - /// each item. - /// - /// + /// /// /// Extra space will be distributed between the items, biased towards the left. /// /// /// /// - /// 111 2222 33333 + /// | 111 2222 33333 | /// /// - Centered, + Center, /// - /// The items will be justified. Space will be added between the items such that the first item - /// is at the start and the right side of the last item against the end. - /// Set to to ensure at least one space between - /// each item. + /// The items will fill the available space. /// /// /// - /// Extra space will be distributed between the items, biased towards the left. + /// Extra space will be distributed between the items, biased towards the end. /// /// /// /// - /// 111 2222 33333 + /// |111 2222 33333| /// /// - Justified, + Fill, /// - /// The first item will be aligned to the left and the remaining will aligned to the right. - /// Set to to ensure at least one space between - /// each item. + /// The first item will be aligned to the start and the remaining will aligned to the end. /// /// /// - /// If the container is smaller than the total size of the items, the right items will be clipped (their locations + /// If the container is smaller than the total size of the items, the end items will be clipped (their locations /// will be greater than the container size). /// + /// + /// + /// + /// |111 2222 33333| + /// + /// + FirstStartRestEnd, + + /// + /// The last item will be aligned to the end and the remaining will aligned to the start. + /// + /// /// - /// and have equivalent behavior. + /// If the container is smaller than the total size of the items, the start items will be clipped (their locations + /// will be negative). /// /// /// /// - /// 111 2222 33333 + /// |111 2222 33333| /// /// - FirstLeftRestRight, - - /// - /// The first item will be aligned to the top and the remaining will aligned to the bottom. - /// Set to to ensure at least one line between - /// each item. - /// - /// - /// - /// If the container is smaller than the total size of the items, the bottom items will be clipped (their locations - /// will be greater than the container size). - /// - /// - /// and have equivalent behavior. - /// - /// - FirstTopRestBottom, - - /// - /// The last item will be aligned to the right and the remaining will aligned to the left. - /// Set to to ensure at least one space between - /// each item. - /// - /// - /// - /// If the container is smaller than the total size of the items, the left items will be clipped (their locations - /// will be negative). - /// - /// - /// and have equivalent behavior. - /// - /// - /// - /// - /// 111 2222 33333 - /// - /// - LastRightRestLeft, - - /// - /// The last item will be aligned to the bottom and the remaining will aligned to the left. - /// Set to to ensure at least one line between - /// each item. - /// - /// - /// - /// If the container is smaller than the total size of the items, the top items will be clipped (their locations - /// will be negative). - /// - /// - /// and have equivalent behavior. - /// - /// - LastBottomRestTop + LastEndRestStart } \ No newline at end of file diff --git a/Terminal.Gui/Drawing/Thickness.cs b/Terminal.Gui/Drawing/Thickness.cs index 1060e21e7..ad684470b 100644 --- a/Terminal.Gui/Drawing/Thickness.cs +++ b/Terminal.Gui/Drawing/Thickness.cs @@ -230,8 +230,8 @@ public class Thickness : IEquatable var tf = new TextFormatter { Text = label is null ? string.Empty : $"{label} {this}", - Alignment = Alignment.Centered, - VerticalAlignment = Alignment.Bottom, + Alignment = Alignment.Center, + VerticalAlignment = Alignment.End, AutoSize = true }; tf.Draw (rect, Application.Driver.CurrentAttribute, Application.Driver.CurrentAttribute, rect); diff --git a/Terminal.Gui/Resources/config.json b/Terminal.Gui/Resources/config.json index c2a63fe15..975605419 100644 --- a/Terminal.Gui/Resources/config.json +++ b/Terminal.Gui/Resources/config.json @@ -24,7 +24,7 @@ "Themes": [ { "Default": { - "Dialog.DefaultButtonAlignment": "Right", + "Dialog.DefaultButtonAlignment": "End", "FrameView.DefaultBorderStyle": "Single", "Window.DefaultBorderStyle": "Single", "ColorSchemes": [ diff --git a/Terminal.Gui/Text/TextFormatter.cs b/Terminal.Gui/Text/TextFormatter.cs index 4aa9d6977..209185205 100644 --- a/Terminal.Gui/Text/TextFormatter.cs +++ b/Terminal.Gui/Text/TextFormatter.cs @@ -17,9 +17,9 @@ public class TextFormatter private Size _size; private int _tabWidth = 4; private string _text; - private Alignment _textAlignment = Alignment.Left; + private Alignment _textAlignment = Alignment.Start; private TextDirection _textDirection; - private Alignment _textVerticalAlignment = Alignment.Top; + private Alignment _textVerticalAlignment = Alignment.Start; private bool _wordWrap = true; /// Get or sets the horizontal text alignment. @@ -34,7 +34,7 @@ public class TextFormatter /// /// Used when is using to resize the view's to fit . /// - /// AutoSize is ignored if is used. + /// AutoSize is ignored if is used. /// /// public bool AutoSize @@ -322,7 +322,7 @@ public class TextFormatter int x = 0, y = 0; // Horizontal Alignment - if (Alignment is Alignment.Right) + if (Alignment is Alignment.End) { if (isVertical) { @@ -337,7 +337,7 @@ public class TextFormatter CursorPosition = screen.Width - runesWidth + (_hotKeyPos > -1 ? _hotKeyPos : 0); } } - else if (Alignment is Alignment.Left) + else if (Alignment is Alignment.Start) { if (isVertical) { @@ -353,7 +353,7 @@ public class TextFormatter CursorPosition = _hotKeyPos > -1 ? _hotKeyPos : 0; } - else if (Alignment is Alignment.Justified) + else if (Alignment is Alignment.Fill) { if (isVertical) { @@ -376,7 +376,7 @@ public class TextFormatter CursorPosition = _hotKeyPos > -1 ? _hotKeyPos : 0; } - else if (Alignment is Alignment.Centered) + else if (Alignment is Alignment.Center) { if (isVertical) { @@ -402,7 +402,7 @@ public class TextFormatter } // Vertical Alignment - if (VerticalAlignment is Alignment.Bottom) + if (VerticalAlignment is Alignment.End) { if (isVertical) { @@ -413,7 +413,7 @@ public class TextFormatter y = screen.Bottom - linesFormatted.Count + line; } } - else if (VerticalAlignment is Alignment.Top) + else if (VerticalAlignment is Alignment.Start) { if (isVertical) { @@ -424,7 +424,7 @@ public class TextFormatter y = screen.Top + line; } } - else if (VerticalAlignment is Alignment.Justified) + else if (VerticalAlignment is Alignment.Fill) { if (isVertical) { @@ -438,7 +438,7 @@ public class TextFormatter line < linesFormatted.Count - 1 ? screen.Height - interval <= 1 ? screen.Top + 1 : screen.Top + line * interval : screen.Bottom - 1; } } - else if (VerticalAlignment is Alignment.Centered) + else if (VerticalAlignment is Alignment.Center) { if (isVertical) { @@ -476,8 +476,8 @@ public class TextFormatter { if (idx < 0 || (isVertical - ? VerticalAlignment != Alignment.Bottom && current < 0 - : Alignment != Alignment.Right && x + current + colOffset < 0)) + ? VerticalAlignment != Alignment.End && current < 0 + : Alignment != Alignment.End && x + current + colOffset < 0)) { current++; @@ -566,7 +566,7 @@ public class TextFormatter if (HotKeyPos > -1 && idx == HotKeyPos) { - if ((isVertical && VerticalAlignment == Alignment.Justified) || (!isVertical && Alignment == Alignment.Justified)) + if ((isVertical && VerticalAlignment == Alignment.Fill) || (!isVertical && Alignment == Alignment.Fill)) { CursorPosition = idx - start; } @@ -704,7 +704,7 @@ public class TextFormatter _lines = Format ( text, Size.Height, - VerticalAlignment == Alignment.Justified, + VerticalAlignment == Alignment.Fill, Size.Width > colsWidth && WordWrap, PreserveTrailingSpaces, TabWidth, @@ -728,7 +728,7 @@ public class TextFormatter _lines = Format ( text, Size.Width, - Alignment == Alignment.Justified, + Alignment == Alignment.Fill, Size.Height > 1 && WordWrap, PreserveTrailingSpaces, TabWidth, @@ -1036,7 +1036,7 @@ public class TextFormatter List runes = StripCRLF (text).ToRuneList (); int start = Math.Max ( - !runes.Contains ((Rune)' ') && textFormatter is { VerticalAlignment: Alignment.Bottom } && IsVerticalDirection (textDirection) + !runes.Contains ((Rune)' ') && textFormatter is { VerticalAlignment: Alignment.End } && IsVerticalDirection (textDirection) ? runes.Count - width : 0, 0); @@ -1268,7 +1268,7 @@ public class TextFormatter TextFormatter textFormatter = null ) { - return ClipAndJustify (text, width, textAlignment == Alignment.Justified, textDirection, tabWidth, textFormatter); + return ClipAndJustify (text, width, textAlignment == Alignment.Fill, textDirection, tabWidth, textFormatter); } /// Justifies text within a specified width. @@ -1309,12 +1309,12 @@ public class TextFormatter { if (IsHorizontalDirection (textDirection)) { - if (textFormatter is { Alignment: Alignment.Right }) + if (textFormatter is { Alignment: Alignment.End }) { return GetRangeThatFits (runes, runes.Count - width, text, width, tabWidth, textDirection); } - if (textFormatter is { Alignment: Alignment.Centered }) + if (textFormatter is { Alignment: Alignment.Center }) { return GetRangeThatFits (runes, Math.Max ((runes.Count - width) / 2, 0), text, width, tabWidth, textDirection); } @@ -1324,12 +1324,12 @@ public class TextFormatter if (IsVerticalDirection (textDirection)) { - if (textFormatter is { VerticalAlignment: Alignment.Bottom }) + if (textFormatter is { VerticalAlignment: Alignment.End }) { return GetRangeThatFits (runes, runes.Count - width, text, width, tabWidth, textDirection); } - if (textFormatter is { VerticalAlignment: Alignment.Centered }) + if (textFormatter is { VerticalAlignment: Alignment.Center }) { return GetRangeThatFits (runes, Math.Max ((runes.Count - width) / 2, 0), text, width, tabWidth, textDirection); } @@ -1347,14 +1347,14 @@ public class TextFormatter if (IsHorizontalDirection (textDirection)) { - if (textFormatter is { Alignment: Alignment.Right }) + if (textFormatter is { Alignment: Alignment.End }) { if (GetRuneWidth (text, tabWidth, textDirection) > width) { return GetRangeThatFits (runes, runes.Count - width, text, width, tabWidth, textDirection); } } - else if (textFormatter is { Alignment: Alignment.Centered }) + else if (textFormatter is { Alignment: Alignment.Center }) { return GetRangeThatFits (runes, Math.Max ((runes.Count - width) / 2, 0), text, width, tabWidth, textDirection); } @@ -1366,14 +1366,14 @@ public class TextFormatter if (IsVerticalDirection (textDirection)) { - if (textFormatter is { VerticalAlignment: Alignment.Bottom }) + if (textFormatter is { VerticalAlignment: Alignment.End }) { if (runes.Count - zeroLength > width) { return GetRangeThatFits (runes, runes.Count - width, text, width, tabWidth, textDirection); } } - else if (textFormatter is { VerticalAlignment: Alignment.Centered }) + else if (textFormatter is { VerticalAlignment: Alignment.Center }) { return GetRangeThatFits (runes, Math.Max ((runes.Count - width) / 2, 0), text, width, tabWidth, textDirection); } @@ -1515,7 +1515,7 @@ public class TextFormatter return Format ( text, width, - textAlignment == Alignment.Justified, + textAlignment == Alignment.Fill, wordWrap, preserveTrailingSpaces, tabWidth, diff --git a/Terminal.Gui/Views/Button.cs b/Terminal.Gui/Views/Button.cs index dc0afde5e..5b1cfcf3d 100644 --- a/Terminal.Gui/Views/Button.cs +++ b/Terminal.Gui/Views/Button.cs @@ -37,8 +37,8 @@ public class Button : View /// The width of the is computed based on the text length. The height will always be 1. public Button () { - TextAlignment = Alignment.Centered; - VerticalTextAlignment = Alignment.Centered; + TextAlignment = Alignment.Center; + VerticalTextAlignment = Alignment.Center; _leftBracket = Glyphs.LeftBracket; _rightBracket = Glyphs.RightBracket; diff --git a/Terminal.Gui/Views/CheckBox.cs b/Terminal.Gui/Views/CheckBox.cs index ab78b470d..cf0adeefc 100644 --- a/Terminal.Gui/Views/CheckBox.cs +++ b/Terminal.Gui/Views/CheckBox.cs @@ -155,13 +155,13 @@ public class CheckBox : View { switch (TextAlignment) { - case Alignment.Left: - case Alignment.Centered: - case Alignment.Justified: + case Alignment.Start: + case Alignment.Center: + case Alignment.Fill: TextFormatter.Text = $"{GetCheckedState ()} {Text}"; break; - case Alignment.Right: + case Alignment.End: TextFormatter.Text = $"{Text} {GetCheckedState ()}"; break; diff --git a/Terminal.Gui/Views/Dialog.cs b/Terminal.Gui/Views/Dialog.cs index 8dcb40d1e..9876ec3ba 100644 --- a/Terminal.Gui/Views/Dialog.cs +++ b/Terminal.Gui/Views/Dialog.cs @@ -122,7 +122,7 @@ public class Dialog : Window /// This property can be set in a Theme. [SerializableConfigurationProperty (Scope = typeof (ThemeScope))] [JsonConverter (typeof (JsonStringEnumConverter))] - public static Alignment DefaultButtonAlignment { get; set; } = Alignment.Right; + public static Alignment DefaultButtonAlignment { get; set; } = Alignment.End; /// /// Adds a to the , its layout will be controlled by the diff --git a/Terminal.Gui/Views/ListView.cs b/Terminal.Gui/Views/ListView.cs index 0a028d5e4..bf2586185 100644 --- a/Terminal.Gui/Views/ListView.cs +++ b/Terminal.Gui/Views/ListView.cs @@ -1002,7 +1002,7 @@ public class ListWrapper : IListDataSource private void RenderUstr (ConsoleDriver driver, string ustr, int col, int line, int width, int start = 0) { string str = start > ustr.GetColumns () ? string.Empty : ustr.Substring (Math.Min (start, ustr.ToRunes ().Length - 1)); - string u = TextFormatter.ClipAndJustify (str, width, Alignment.Left); + string u = TextFormatter.ClipAndJustify (str, width, Alignment.Start); driver.AddStr (u); width -= u.GetColumns (); diff --git a/Terminal.Gui/Views/Menu/Menu.cs b/Terminal.Gui/Views/Menu/Menu.cs index 1673862a0..17e92cd1d 100644 --- a/Terminal.Gui/Views/Menu/Menu.cs +++ b/Terminal.Gui/Views/Menu/Menu.cs @@ -890,7 +890,7 @@ internal sealed class Menu : View var tf = new TextFormatter { AutoSize = true, - Alignment = Alignment.Centered, HotKeySpecifier = MenuBar.HotKeySpecifier, Text = textToDraw + Alignment = Alignment.Center, HotKeySpecifier = MenuBar.HotKeySpecifier, Text = textToDraw }; // The -3 is left/right border + one space (not sure what for) diff --git a/Terminal.Gui/Views/MessageBox.cs b/Terminal.Gui/Views/MessageBox.cs index a1f2c86de..e8d70d65e 100644 --- a/Terminal.Gui/Views/MessageBox.cs +++ b/Terminal.Gui/Views/MessageBox.cs @@ -341,7 +341,7 @@ public static class MessageBox } Alignment buttonJust = Dialog.DefaultButtonAlignment; - Dialog.DefaultButtonAlignment = Alignment.Centered; + Dialog.DefaultButtonAlignment = Alignment.Center; var d = new Dialog { Buttons = buttonList.ToArray (), @@ -374,7 +374,7 @@ public static class MessageBox var messageLabel = new Label { Text = message, - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, X = Pos.Center (), Y = 0, // ColorScheme = Colors.ColorSchemes ["Error"] diff --git a/Terminal.Gui/Views/ProgressBar.cs b/Terminal.Gui/Views/ProgressBar.cs index 7b73d62c0..80b7545b7 100644 --- a/Terminal.Gui/Views/ProgressBar.cs +++ b/Terminal.Gui/Views/ProgressBar.cs @@ -175,7 +175,7 @@ public class ProgressBar : View if (ProgressBarFormat != ProgressBarFormat.Simple && !_isActivity) { - var tf = new TextFormatter { Alignment = Alignment.Centered, Text = Text, AutoSize = true }; + var tf = new TextFormatter { Alignment = Alignment.Center, Text = Text, AutoSize = true }; var attr = new Attribute (ColorScheme.HotNormal.Foreground, ColorScheme.HotNormal.Background); if (_fraction > .5) diff --git a/Terminal.Gui/Views/Slider.cs b/Terminal.Gui/Views/Slider.cs index e26eb650d..c42247299 100644 --- a/Terminal.Gui/Views/Slider.cs +++ b/Terminal.Gui/Views/Slider.cs @@ -816,18 +816,18 @@ public class Slider : View // Note: The formatter doesn't handle all of this ??? switch (alignment) { - case Alignment.Justified: + case Alignment.Fill: return TextFormatter.Justify (text, width); - case Alignment.Left: + case Alignment.Start: return text + s1 + s1 + s2; - case Alignment.Centered: + case Alignment.Center: if (text.Length % 2 != 0) { return s1 + text + s1 + s2; } return s1 + s2 + text + s1; - case Alignment.Right: + case Alignment.End: return s1 + s1 + s2 + text; default: return text; @@ -934,12 +934,6 @@ public class Slider : View } break; - case SliderType.Single: - break; - case SliderType.Multiple: - break; - default: - throw new ArgumentOutOfRangeException (); } } @@ -1160,7 +1154,7 @@ public class Slider : View switch (_config._legendsOrientation) { case Orientation.Horizontal: - text = AlignText (text, _config._cachedInnerSpacing + 1, Alignment.Centered); + text = AlignText (text, _config._cachedInnerSpacing + 1, Alignment.Center); break; case Orientation.Vertical: @@ -1178,7 +1172,7 @@ public class Slider : View break; case Orientation.Vertical: - text = AlignText (text, _config._cachedInnerSpacing + 1, Alignment.Centered); + text = AlignText (text, _config._cachedInnerSpacing + 1, Alignment.Center); break; } diff --git a/Terminal.Gui/Views/TableView/TableView.cs b/Terminal.Gui/Views/TableView/TableView.cs index 099f4d1e2..5e8ed2d74 100644 --- a/Terminal.Gui/Views/TableView/TableView.cs +++ b/Terminal.Gui/Views/TableView/TableView.cs @@ -2116,16 +2116,16 @@ public class TableView : View - (representation.EnumerateRunes ().Sum (c => c.GetColumns ()) + 1 /*leave 1 space for cell boundary*/); - switch (colStyle?.GetAlignment (originalCellValue) ?? Alignment.Left) + switch (colStyle?.GetAlignment (originalCellValue) ?? Alignment.Start) { - case Alignment.Left: + case Alignment.Start: return representation + new string (' ', toPad); - case Alignment.Right: + case Alignment.End: return new string (' ', toPad) + representation; // TODO: With single line cells, centered and justified are the same right? - case Alignment.Centered: - case Alignment.Justified: + case Alignment.Center: + case Alignment.Fill: return new string (' ', (int)Math.Floor (toPad / 2.0)) + // round down diff --git a/Terminal.Gui/Views/TextValidateField.cs b/Terminal.Gui/Views/TextValidateField.cs index eb6bdc5c3..3aac68f09 100644 --- a/Terminal.Gui/Views/TextValidateField.cs +++ b/Terminal.Gui/Views/TextValidateField.cs @@ -539,7 +539,7 @@ namespace Terminal.Gui { int c = _provider.Cursor (mouseEvent.Position.X - GetMargins (Viewport.Width).left); - if (_provider.Fixed == false && TextAlignment == Alignment.Right && Text.Length > 0) + if (_provider.Fixed == false && TextAlignment == Alignment.End && Text.Length > 0) { c++; } @@ -633,7 +633,7 @@ namespace Terminal.Gui // When it's right-aligned and it's a normal input, the cursor behaves differently. int curPos; - if (_provider?.Fixed == false && TextAlignment == Alignment.Right) + if (_provider?.Fixed == false && TextAlignment == Alignment.End) { curPos = _cursorPosition + left - 1; } @@ -650,7 +650,7 @@ namespace Terminal.Gui /// private bool BackspaceKeyHandler () { - if (_provider.Fixed == false && TextAlignment == Alignment.Right && _cursorPosition <= 1) + if (_provider.Fixed == false && TextAlignment == Alignment.End && _cursorPosition <= 1) { return false; } @@ -688,7 +688,7 @@ namespace Terminal.Gui /// private bool DeleteKeyHandler () { - if (_provider.Fixed == false && TextAlignment == Alignment.Right) + if (_provider.Fixed == false && TextAlignment == Alignment.End) { _cursorPosition = _provider.CursorLeft (_cursorPosition); } @@ -719,11 +719,11 @@ namespace Terminal.Gui switch (TextAlignment) { - case Alignment.Left: + case Alignment.Start: return (0, total); - case Alignment.Centered: + case Alignment.Center: return (total / 2, total / 2 + total % 2); - case Alignment.Right: + case Alignment.End: return (total, 0); default: return (0, total); diff --git a/Terminal.Gui/Views/TextView.cs b/Terminal.Gui/Views/TextView.cs index 09531f254..d36fcda57 100644 --- a/Terminal.Gui/Views/TextView.cs +++ b/Terminal.Gui/Views/TextView.cs @@ -1784,7 +1784,7 @@ internal class WordWrapManager TextFormatter.Format ( TextModel.ToString (line), width, - Alignment.Left, + Alignment.Start, true, preserveTrailingSpaces, tabWidth diff --git a/Terminal.Gui/Views/Wizard/Wizard.cs b/Terminal.Gui/Views/Wizard/Wizard.cs index c6334e434..53a84ad8e 100644 --- a/Terminal.Gui/Views/Wizard/Wizard.cs +++ b/Terminal.Gui/Views/Wizard/Wizard.cs @@ -67,7 +67,7 @@ public class Wizard : Dialog public Wizard () { // TODO: LastRightRestLeft will enable a "Quit" button to always appear at the far left - ButtonAlignment = Alignment.LastRightRestLeft; + ButtonAlignment = Alignment.LastEndRestStart; BorderStyle = LineStyle.Double; //// Add a horiz separator diff --git a/UICatalog/Scenarios/BasicColors.cs b/UICatalog/Scenarios/BasicColors.cs index 58bbcce88..b1b75c54f 100644 --- a/UICatalog/Scenarios/BasicColors.cs +++ b/UICatalog/Scenarios/BasicColors.cs @@ -32,7 +32,7 @@ public class BasicColors : Scenario Y = 0, Width = 1, Height = 13, - VerticalTextAlignment = Alignment.Bottom, + VerticalTextAlignment = Alignment.End, ColorScheme = new ColorScheme { Normal = attr }, Text = bg.ToString (), TextDirection = TextDirection.TopBottom_LeftRight @@ -45,7 +45,7 @@ public class BasicColors : Scenario Y = y, Width = 13, Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, ColorScheme = new ColorScheme { Normal = attr }, Text = bg.ToString () }; diff --git a/UICatalog/Scenarios/Buttons.cs b/UICatalog/Scenarios/Buttons.cs index 1fd83c2b8..ccce3bc2f 100644 --- a/UICatalog/Scenarios/Buttons.cs +++ b/UICatalog/Scenarios/Buttons.cs @@ -287,39 +287,39 @@ public class Buttons : Scenario switch (args.SelectedItem) { case 0: - moveBtn.TextAlignment = Alignment.Left; - sizeBtn.TextAlignment = Alignment.Left; - moveBtnA.TextAlignment = Alignment.Left; - sizeBtnA.TextAlignment = Alignment.Left; - moveHotKeyBtn.TextAlignment = Alignment.Left; - moveUnicodeHotKeyBtn.TextAlignment = Alignment.Left; + moveBtn.TextAlignment = Alignment.Start; + sizeBtn.TextAlignment = Alignment.Start; + moveBtnA.TextAlignment = Alignment.Start; + sizeBtnA.TextAlignment = Alignment.Start; + moveHotKeyBtn.TextAlignment = Alignment.Start; + moveUnicodeHotKeyBtn.TextAlignment = Alignment.Start; break; case 1: - moveBtn.TextAlignment = Alignment.Right; - sizeBtn.TextAlignment = Alignment.Right; - moveBtnA.TextAlignment = Alignment.Right; - sizeBtnA.TextAlignment = Alignment.Right; - moveHotKeyBtn.TextAlignment = Alignment.Right; - moveUnicodeHotKeyBtn.TextAlignment = Alignment.Right; + moveBtn.TextAlignment = Alignment.End; + sizeBtn.TextAlignment = Alignment.End; + moveBtnA.TextAlignment = Alignment.End; + sizeBtnA.TextAlignment = Alignment.End; + moveHotKeyBtn.TextAlignment = Alignment.End; + moveUnicodeHotKeyBtn.TextAlignment = Alignment.End; break; case 2: - moveBtn.TextAlignment = Alignment.Centered; - sizeBtn.TextAlignment = Alignment.Centered; - moveBtnA.TextAlignment = Alignment.Centered; - sizeBtnA.TextAlignment = Alignment.Centered; - moveHotKeyBtn.TextAlignment = Alignment.Centered; - moveUnicodeHotKeyBtn.TextAlignment = Alignment.Centered; + moveBtn.TextAlignment = Alignment.Center; + sizeBtn.TextAlignment = Alignment.Center; + moveBtnA.TextAlignment = Alignment.Center; + sizeBtnA.TextAlignment = Alignment.Center; + moveHotKeyBtn.TextAlignment = Alignment.Center; + moveUnicodeHotKeyBtn.TextAlignment = Alignment.Center; break; case 3: - moveBtn.TextAlignment = Alignment.Justified; - sizeBtn.TextAlignment = Alignment.Justified; - moveBtnA.TextAlignment = Alignment.Justified; - sizeBtnA.TextAlignment = Alignment.Justified; - moveHotKeyBtn.TextAlignment = Alignment.Justified; - moveUnicodeHotKeyBtn.TextAlignment = Alignment.Justified; + moveBtn.TextAlignment = Alignment.Fill; + sizeBtn.TextAlignment = Alignment.Fill; + moveBtnA.TextAlignment = Alignment.Fill; + sizeBtnA.TextAlignment = Alignment.Fill; + moveHotKeyBtn.TextAlignment = Alignment.Fill; + moveUnicodeHotKeyBtn.TextAlignment = Alignment.Fill; break; } @@ -439,7 +439,7 @@ public class Buttons : Scenario Y = Pos.Top (_down), Width = Dim.Func (() => Digits), Height = 1, - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, CanFocus = true }; diff --git a/UICatalog/Scenarios/CharacterMap.cs b/UICatalog/Scenarios/CharacterMap.cs index 07a99b69d..9616c30d5 100644 --- a/UICatalog/Scenarios/CharacterMap.cs +++ b/UICatalog/Scenarios/CharacterMap.cs @@ -958,7 +958,7 @@ internal class CharMap : View Y = 1, Width = Dim.Fill (), Height = Dim.Fill (1), - TextAlignment = Alignment.Centered + TextAlignment = Alignment.Center }; var spinner = new SpinnerView { X = Pos.Center (), Y = Pos.Center (), Style = new Aesthetic () }; spinner.AutoSpin = true; diff --git a/UICatalog/Scenarios/CollectionNavigatorTester.cs b/UICatalog/Scenarios/CollectionNavigatorTester.cs index 0c9b3ab14..4797e4c22 100644 --- a/UICatalog/Scenarios/CollectionNavigatorTester.cs +++ b/UICatalog/Scenarios/CollectionNavigatorTester.cs @@ -142,7 +142,7 @@ public class CollectionNavigatorTester : Scenario var label = new Label { Text = "ListView", - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, X = 0, Y = 1, // for menu Width = Dim.Percent (50), @@ -171,7 +171,7 @@ public class CollectionNavigatorTester : Scenario var label = new Label { Text = "TreeView", - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, X = Pos.Right (_listView) + 2, Y = 1, // for menu Width = Dim.Percent (50), diff --git a/UICatalog/Scenarios/ColorPicker.cs b/UICatalog/Scenarios/ColorPicker.cs index 6d5f61814..5bc84b70d 100644 --- a/UICatalog/Scenarios/ColorPicker.cs +++ b/UICatalog/Scenarios/ColorPicker.cs @@ -69,8 +69,8 @@ public class ColorPickers : Scenario { Title = "Color Sample", Text = "Lorem Ipsum", - TextAlignment = Alignment.Centered, - VerticalTextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, + VerticalTextAlignment = Alignment.Center, BorderStyle = LineStyle.Heavy, X = Pos.Center (), Y = Pos.Center (), diff --git a/UICatalog/Scenarios/ComputedLayout.cs b/UICatalog/Scenarios/ComputedLayout.cs index 9c9901751..496ea6c75 100644 --- a/UICatalog/Scenarios/ComputedLayout.cs +++ b/UICatalog/Scenarios/ComputedLayout.cs @@ -91,7 +91,7 @@ public class ComputedLayout : Scenario labelList.Add ( new Label { - TextAlignment = Alignment.Left, + TextAlignment = Alignment.Start, Width = Dim.Fill (), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()), @@ -103,7 +103,7 @@ public class ComputedLayout : Scenario labelList.Add ( new Label { - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Width = Dim.Fill (), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()), @@ -115,7 +115,7 @@ public class ComputedLayout : Scenario labelList.Add ( new Label { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = Dim.Fill (), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()), @@ -127,7 +127,7 @@ public class ComputedLayout : Scenario labelList.Add ( new Label { - TextAlignment = Alignment.Justified, + TextAlignment = Alignment.Fill, Width = Dim.Fill (), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()), @@ -153,7 +153,7 @@ public class ComputedLayout : Scenario labelList.Add ( new Label { - TextAlignment = Alignment.Left, + TextAlignment = Alignment.Start, Width = Dim.Fill (), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()), @@ -165,7 +165,7 @@ public class ComputedLayout : Scenario labelList.Add ( new Label { - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Width = Dim.Fill (), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()), @@ -177,7 +177,7 @@ public class ComputedLayout : Scenario labelList.Add ( new Label { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = Dim.Fill (), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()), @@ -189,7 +189,7 @@ public class ComputedLayout : Scenario labelList.Add ( new Label { - TextAlignment = Alignment.Justified, + TextAlignment = Alignment.Fill, Width = Dim.Fill (), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()), @@ -324,7 +324,7 @@ public class ComputedLayout : Scenario var anchorEndLabel1 = new Label { Text = "This Label should be the 3rd to last line (AnchorEnd (3)).", - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, ColorScheme = Colors.ColorSchemes ["Menu"], Width = Dim.Fill (5), X = 5, @@ -338,7 +338,7 @@ public class ComputedLayout : Scenario { Text = "This TextField should be the 4th to last line (AnchorEnd (3) - 1).", - TextAlignment = Alignment.Left, + TextAlignment = Alignment.Start, ColorScheme = Colors.ColorSchemes ["Menu"], Width = Dim.Fill (5), X = 5, @@ -397,9 +397,9 @@ public class ComputedLayout : Scenario // Center three buttons with - leftButton.X = Pos.Align (Alignment.Centered); - centerButton.X = Pos.Align (Alignment.Centered); - rightButton.X = Pos.Align (Alignment.Centered); + leftButton.X = Pos.Align (Alignment.Center); + centerButton.X = Pos.Align (Alignment.Center); + rightButton.X = Pos.Align (Alignment.Center); Application.Run (app); app.Dispose (); diff --git a/UICatalog/Scenarios/CsvEditor.cs b/UICatalog/Scenarios/CsvEditor.cs index 0139ff90e..2584462bc 100644 --- a/UICatalog/Scenarios/CsvEditor.cs +++ b/UICatalog/Scenarios/CsvEditor.cs @@ -78,17 +78,17 @@ public class CsvEditor : Scenario _miLeft = new MenuItem ( "_Align Left", "", - () => Align (Alignment.Left) + () => Align (Alignment.Start) ), _miRight = new MenuItem ( "_Align Right", "", - () => Align (Alignment.Right) + () => Align (Alignment.End) ), _miCentered = new MenuItem ( "_Align Centered", "", - () => Align (Alignment.Centered) + () => Align (Alignment.Center) ), // Format requires hard typed data table, when we read a CSV everything is untyped (string) so this only works for new columns in this demo @@ -133,7 +133,7 @@ public class CsvEditor : Scenario Y = Pos.Bottom (_tableView), Text = "0,0", Width = Dim.Fill (), - TextAlignment = Alignment.Right + TextAlignment = Alignment.End }; _selectedCellLabel.TextChanged += SelectedCellLabel_TextChanged; @@ -228,9 +228,9 @@ public class CsvEditor : Scenario ColumnStyle style = _tableView.Style.GetOrCreateColumnStyle (_tableView.SelectedColumn); style.Alignment = newAlignment; - _miLeft.Checked = style.Alignment == Alignment.Left; - _miRight.Checked = style.Alignment == Alignment.Right; - _miCentered.Checked = style.Alignment == Alignment.Centered; + _miLeft.Checked = style.Alignment == Alignment.Start; + _miRight.Checked = style.Alignment == Alignment.End; + _miCentered.Checked = style.Alignment == Alignment.Center; _tableView.Update (); } @@ -437,9 +437,9 @@ public class CsvEditor : Scenario ColumnStyle style = _tableView.Style.GetColumnStyleIfAny (_tableView.SelectedColumn); - _miLeft.Checked = style?.Alignment == Alignment.Left; - _miRight.Checked = style?.Alignment == Alignment.Right; - _miCentered.Checked = style?.Alignment == Alignment.Centered; + _miLeft.Checked = style?.Alignment == Alignment.Start; + _miRight.Checked = style?.Alignment == Alignment.End; + _miCentered.Checked = style?.Alignment == Alignment.Center; } private void Open () diff --git a/UICatalog/Scenarios/Dialogs.cs b/UICatalog/Scenarios/Dialogs.cs index 40c888f22..54ce3bba3 100644 --- a/UICatalog/Scenarios/Dialogs.cs +++ b/UICatalog/Scenarios/Dialogs.cs @@ -32,7 +32,7 @@ public class Dialogs : Scenario var numButtonsLabel = new Label { X = 0, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = "_Number of Buttons:" }; @@ -42,7 +42,7 @@ public class Dialogs : Scenario Y = 0, Width = Dim.Width (numButtonsLabel), Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = "_Width:" }; frame.Add (label); @@ -63,7 +63,7 @@ public class Dialogs : Scenario Y = Pos.Bottom (label), Width = Dim.Width (numButtonsLabel), Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = "_Height:" }; frame.Add (label); @@ -97,7 +97,7 @@ public class Dialogs : Scenario Y = Pos.Bottom (label), Width = Dim.Width (numButtonsLabel), Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = "_Title:" }; frame.Add (label); @@ -129,7 +129,7 @@ public class Dialogs : Scenario { X = Pos.Right (numButtonsLabel) + 1, Y = Pos.Bottom (numButtonsLabel), - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = $"_Add {char.ConvertFromUtf32 (CODE_POINT)} to button text to stress wide char support", Checked = false }; @@ -141,7 +141,7 @@ public class Dialogs : Scenario Y = Pos.Bottom (glyphsNotWords), Width = Dim.Width (numButtonsLabel), Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = "Button A_lignment:" }; frame.Add (label); @@ -162,7 +162,7 @@ public class Dialogs : Scenario label = new () { - X = Pos.Center (), Y = Pos.Bottom (frame) + 4, TextAlignment = Alignment.Right, Text = "Button Pressed:" + X = Pos.Center (), Y = Pos.Bottom (frame) + 4, TextAlignment = Alignment.End, Text = "Button Pressed:" }; app.Add (label); diff --git a/UICatalog/Scenarios/DynamicMenuBar.cs b/UICatalog/Scenarios/DynamicMenuBar.cs index d3260619e..3bfed35af 100644 --- a/UICatalog/Scenarios/DynamicMenuBar.cs +++ b/UICatalog/Scenarios/DynamicMenuBar.cs @@ -623,7 +623,7 @@ public class DynamicMenuBar : Scenario var _lblMenuBar = new Label { ColorScheme = Colors.ColorSchemes ["Dialog"], - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, X = Pos.Right (_btnPrevious) + 1, Y = Pos.Top (_btnPrevious), @@ -636,7 +636,7 @@ public class DynamicMenuBar : Scenario var _lblParent = new Label { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, X = Pos.Right (_btnPrevious) + 1, Y = Pos.Top (_btnPrevious) + 1, diff --git a/UICatalog/Scenarios/Editor.cs b/UICatalog/Scenarios/Editor.cs index 35582ccf7..f475f45f8 100644 --- a/UICatalog/Scenarios/Editor.cs +++ b/UICatalog/Scenarios/Editor.cs @@ -882,7 +882,7 @@ public class Editor : Scenario { Y = 1, Width = lblWidth, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = "Find:" }; @@ -903,7 +903,7 @@ public class Editor : Scenario Y = Pos.Top (label), Width = 20, Enabled = !string.IsNullOrEmpty (txtToFind.Text), - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, IsDefault = true, Text = "Find _Next" @@ -917,7 +917,7 @@ public class Editor : Scenario Y = Pos.Top (btnFindNext) + 1, Width = 20, Enabled = !string.IsNullOrEmpty (txtToFind.Text), - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Text = "Find _Previous" }; @@ -937,7 +937,7 @@ public class Editor : Scenario X = Pos.Right (txtToFind) + 1, Y = Pos.Top (btnFindPrevious) + 2, Width = 20, - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Text = "Cancel" }; @@ -1134,7 +1134,7 @@ public class Editor : Scenario { Y = 1, Width = lblWidth, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = "Find:" }; @@ -1155,7 +1155,7 @@ public class Editor : Scenario Y = Pos.Top (label), Width = 20, Enabled = !string.IsNullOrEmpty (txtToFind.Text), - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, IsDefault = true, Text = "Replace _Next" @@ -1181,7 +1181,7 @@ public class Editor : Scenario Y = Pos.Top (btnFindNext) + 1, Width = 20, Enabled = !string.IsNullOrEmpty (txtToFind.Text), - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Text = "Replace _Previous" }; @@ -1194,7 +1194,7 @@ public class Editor : Scenario Y = Pos.Top (btnFindPrevious) + 1, Width = 20, Enabled = !string.IsNullOrEmpty (txtToFind.Text), - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Text = "Replace _All" }; @@ -1215,7 +1215,7 @@ public class Editor : Scenario X = Pos.Right (txtToFind) + 1, Y = Pos.Top (btnReplaceAll) + 1, Width = 20, - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Text = "Cancel" }; diff --git a/UICatalog/Scenarios/ListColumns.cs b/UICatalog/Scenarios/ListColumns.cs index f9f39d27b..09aad302e 100644 --- a/UICatalog/Scenarios/ListColumns.cs +++ b/UICatalog/Scenarios/ListColumns.cs @@ -247,7 +247,7 @@ public class ListColumns : Scenario Text = "0,0", Width = Dim.Fill (), - TextAlignment = Alignment.Right + TextAlignment = Alignment.End }; Win.Add (selectedCellLabel); diff --git a/UICatalog/Scenarios/MessageBoxes.cs b/UICatalog/Scenarios/MessageBoxes.cs index e5970d5b1..79bc622f0 100644 --- a/UICatalog/Scenarios/MessageBoxes.cs +++ b/UICatalog/Scenarios/MessageBoxes.cs @@ -30,7 +30,7 @@ public class MessageBoxes : Scenario app.Add (frame); // TODO: Use Pos.Align her to demo aligning labels and fields - var label = new Label { X = 0, Y = 0, Width = 15, TextAlignment = Alignment.Right, Text = "Width:" }; + var label = new Label { X = 0, Y = 0, Width = 15, TextAlignment = Alignment.End, Text = "Width:" }; frame.Add (label); var widthEdit = new TextField @@ -50,7 +50,7 @@ public class MessageBoxes : Scenario Width = Dim.Width (label), Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = "Height:" }; frame.Add (label); @@ -85,7 +85,7 @@ public class MessageBoxes : Scenario Width = Dim.Width (label), Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = "Title:" }; frame.Add (label); @@ -107,7 +107,7 @@ public class MessageBoxes : Scenario Width = Dim.Width (label), Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = "Message:" }; frame.Add (label); @@ -129,7 +129,7 @@ public class MessageBoxes : Scenario Width = Dim.Width (label), Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = "Num Buttons:" }; frame.Add (label); @@ -151,7 +151,7 @@ public class MessageBoxes : Scenario Width = Dim.Width (label), Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = "Default Button:" }; frame.Add (label); @@ -173,7 +173,7 @@ public class MessageBoxes : Scenario Width = Dim.Width (label), Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = "Style:" }; frame.Add (label); @@ -194,7 +194,7 @@ public class MessageBoxes : Scenario label = new () { - X = Pos.Center (), Y = Pos.Bottom (frame) + 2, TextAlignment = Alignment.Right, Text = "Button Pressed:" + X = Pos.Center (), Y = Pos.Bottom (frame) + 2, TextAlignment = Alignment.End, Text = "Button Pressed:" }; app.Add (label); @@ -203,7 +203,7 @@ public class MessageBoxes : Scenario X = Pos.Center (), Y = Pos.Bottom (label) + 1, ColorScheme = Colors.ColorSchemes ["Error"], - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Text = " " }; diff --git a/UICatalog/Scenarios/Mouse.cs b/UICatalog/Scenarios/Mouse.cs index 28754d2bf..20a5e6118 100644 --- a/UICatalog/Scenarios/Mouse.cs +++ b/UICatalog/Scenarios/Mouse.cs @@ -100,8 +100,8 @@ public class Mouse : Scenario Width = 20, Height = 3, Text = "Enter/Leave Demo", - TextAlignment = Alignment.Centered, - VerticalTextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, + VerticalTextAlignment = Alignment.Center, ColorScheme = Colors.ColorSchemes ["Dialog"] }; win.Add (demo); diff --git a/UICatalog/Scenarios/PosAlignDemo.cs b/UICatalog/Scenarios/PosAlignDemo.cs index 1da0181e4..1b75dc343 100644 --- a/UICatalog/Scenarios/PosAlignDemo.cs +++ b/UICatalog/Scenarios/PosAlignDemo.cs @@ -47,7 +47,7 @@ public sealed class PosAlignDemo : Scenario { X = Pos.Align (_horizAligner.Alignment), Y = Pos.Center (), - RadioLabels = new [] { "Left", "Right", "Centered", "Justified", "FirstLeftRestRight", "LastRightRestLeft" }, + RadioLabels = new [] { "Start", "End", "Center", "Fill", "FirstLeftRestRight", "LastRightRestLeft" }, ColorScheme = colorScheme }; @@ -192,7 +192,7 @@ public sealed class PosAlignDemo : Scenario { X = 0, Y = Pos.Align (_vertAligner.Alignment), - RadioLabels = new [] { "Top", "Bottom", "Centered", "Justified", "FirstTopRestBottom", "LastBottomRestTop" }, + RadioLabels = new [] { "Start", "End", "Center", "Fill", "FirstStartRestEnd", "LastEndRestStart" }, ColorScheme = colorScheme }; @@ -358,8 +358,8 @@ public sealed class PosAlignDemo : Scenario Width = 5 }; - v.X = Pos.Align (Alignment.Right, i / 3); - v.Y = Pos.Align (Alignment.Justified, i % 3 + 10); + v.X = Pos.Align (Alignment.End, i / 3); + v.Y = Pos.Align (Alignment.Fill, i % 3 + 10); container.Add (v); } diff --git a/UICatalog/Scenarios/ProgressBarStyles.cs b/UICatalog/Scenarios/ProgressBarStyles.cs index 702c3876e..e13942358 100644 --- a/UICatalog/Scenarios/ProgressBarStyles.cs +++ b/UICatalog/Scenarios/ProgressBarStyles.cs @@ -50,7 +50,7 @@ public class ProgressBarStyles : Scenario var pbList = new ListView { Title = "Focused ProgressBar", - Y = Pos.Align (Alignment.Top), + Y = Pos.Align (Alignment.Start), X = Pos.Center (), Width = Dim.Auto (), Height = Dim.Auto (), @@ -98,7 +98,7 @@ public class ProgressBarStyles : Scenario { Text = "Foreground HotNormal Color", X = Pos.Center (), - Y = Pos.Align (Alignment.Top), + Y = Pos.Align (Alignment.Start), }; container.Add (fgColorPickerBtn); @@ -124,7 +124,7 @@ public class ProgressBarStyles : Scenario var bgColorPickerBtn = new Button { X = Pos.Center (), - Y = Pos.Align (Alignment.Top), + Y = Pos.Align (Alignment.Start), Text = "Background HotNormal Color" }; container.Add (bgColorPickerBtn); @@ -158,7 +158,7 @@ public class ProgressBarStyles : Scenario BorderStyle = LineStyle.Single, Title = "ProgressBarFormat", X = Pos.Center (), - Y = Pos.Align (Alignment.Top), + Y = Pos.Align (Alignment.Start), RadioLabels = pbFormatEnum.Select (e => e.ToString ()).ToArray () }; container.Add (rbPBFormat); @@ -166,7 +166,7 @@ public class ProgressBarStyles : Scenario var button = new Button { X = Pos.Center (), - Y = Pos.Align (Alignment.Top), + Y = Pos.Align (Alignment.Start), Text = "Start timer" }; container.Add (button); @@ -175,7 +175,7 @@ public class ProgressBarStyles : Scenario { Title = "Blocks", X = Pos.Center (), - Y = Pos.Align (Alignment.Top), + Y = Pos.Align (Alignment.Start), Width = Dim.Percent (50), BorderStyle = LineStyle.Single, CanFocus = true @@ -188,7 +188,7 @@ public class ProgressBarStyles : Scenario { Title = "Continuous", X = Pos.Center (), - Y = Pos.Align (Alignment.Top), + Y = Pos.Align (Alignment.Start), Width = Dim.Percent (50), ProgressBarStyle = ProgressBarStyle.Continuous, BorderStyle = LineStyle.Single, @@ -238,7 +238,7 @@ public class ProgressBarStyles : Scenario { Title = "Marquee Blocks", X = Pos.Center (), - Y = Pos.Align (Alignment.Top), + Y = Pos.Align (Alignment.Start), Width = Dim.Percent (50), ProgressBarStyle = ProgressBarStyle.MarqueeBlocks, BorderStyle = LineStyle.Single, @@ -250,7 +250,7 @@ public class ProgressBarStyles : Scenario { Title = "Marquee Continuous", X = Pos.Center (), - Y = Pos.Align (Alignment.Top), + Y = Pos.Align (Alignment.Start), Width = Dim.Percent (50), ProgressBarStyle = ProgressBarStyle.MarqueeContinuous, BorderStyle = LineStyle.Single, diff --git a/UICatalog/Scenarios/TableEditor.cs b/UICatalog/Scenarios/TableEditor.cs index a3abcacf1..70c3151b8 100644 --- a/UICatalog/Scenarios/TableEditor.cs +++ b/UICatalog/Scenarios/TableEditor.cs @@ -707,7 +707,7 @@ public class TableEditor : Scenario Text = "0,0", Width = Dim.Fill (), - TextAlignment = Alignment.Right + TextAlignment = Alignment.End }; Win.Add (selectedCellLabel); @@ -1107,12 +1107,12 @@ public class TableEditor : Scenario { _tableView.Style.ColumnStyles.Clear (); - var alignMid = new ColumnStyle { Alignment = Alignment.Centered }; - var alignRight = new ColumnStyle { Alignment = Alignment.Right }; + var alignMid = new ColumnStyle { Alignment = Alignment.Center }; + var alignRight = new ColumnStyle { Alignment = Alignment.End }; var dateFormatStyle = new ColumnStyle { - Alignment = Alignment.Right, + Alignment = Alignment.End, RepresentationGetter = v => v is DateTime d ? d.ToString ("yyyy-MM-dd") : v.ToString () }; @@ -1126,15 +1126,15 @@ public class TableEditor : Scenario // align negative values right d < 0 - ? Alignment.Right + ? Alignment.End : // align positive values left - Alignment.Left + Alignment.Start : // not a double - Alignment.Left, + Alignment.Start, ColorGetter = a => a.CellValue is double d ? diff --git a/UICatalog/Scenarios/Text.cs b/UICatalog/Scenarios/Text.cs index a4cae937f..13e61c168 100644 --- a/UICatalog/Scenarios/Text.cs +++ b/UICatalog/Scenarios/Text.cs @@ -290,7 +290,7 @@ public class Text : Scenario X = Pos.Right (regexProvider) + 1, Y = Pos.Y (regexProvider), Width = 30, - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Provider = provider2 }; Win.Add (regexProviderField); diff --git a/UICatalog/Scenarios/TextAlignmentAndDirection.cs b/UICatalog/Scenarios/TextAlignmentAndDirection.cs index 8a8e1f82a..4aeee9274 100644 --- a/UICatalog/Scenarios/TextAlignmentAndDirection.cs +++ b/UICatalog/Scenarios/TextAlignmentAndDirection.cs @@ -35,7 +35,7 @@ public class TextAlignmentAndDirection : Scenario Y = 1, Width = 9, Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, ColorScheme = Colors.ColorSchemes ["Dialog"], Text = "Left" }; @@ -46,7 +46,7 @@ public class TextAlignmentAndDirection : Scenario Y = 2, Width = 9, Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, ColorScheme = Colors.ColorSchemes ["Dialog"], Text = "Centered" }; @@ -57,7 +57,7 @@ public class TextAlignmentAndDirection : Scenario Y = 3, Width = 9, Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, ColorScheme = Colors.ColorSchemes ["Dialog"], Text = "Right" }; @@ -68,7 +68,7 @@ public class TextAlignmentAndDirection : Scenario Y = 4, Width = 9, Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, ColorScheme = Colors.ColorSchemes ["Dialog"], Text = "Justified" }; @@ -80,7 +80,7 @@ public class TextAlignmentAndDirection : Scenario Width = Dim.Fill (1) - 9, Height = 1, ColorScheme = color1, - TextAlignment = Alignment.Left, + TextAlignment = Alignment.Start, Text = txt }; @@ -91,7 +91,7 @@ public class TextAlignmentAndDirection : Scenario Width = Dim.Fill (1) - 9, Height = 1, ColorScheme = color2, - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Text = txt }; @@ -102,7 +102,7 @@ public class TextAlignmentAndDirection : Scenario Width = Dim.Fill (1) - 9, Height = 1, ColorScheme = color1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = txt }; @@ -113,7 +113,7 @@ public class TextAlignmentAndDirection : Scenario Width = Dim.Fill (1) - 9, Height = 1, ColorScheme = color2, - TextAlignment = Alignment.Justified, + TextAlignment = Alignment.Fill, Text = txt }; @@ -141,7 +141,7 @@ public class TextAlignmentAndDirection : Scenario Height = 9, ColorScheme = color1, TextDirection = TextDirection.TopBottom_LeftRight, - VerticalTextAlignment = Alignment.Bottom, + VerticalTextAlignment = Alignment.End, Text = "Top" }; labelVT.TextFormatter.WordWrap = false; @@ -154,7 +154,7 @@ public class TextAlignmentAndDirection : Scenario Height = 9, ColorScheme = color1, TextDirection = TextDirection.TopBottom_LeftRight, - VerticalTextAlignment = Alignment.Bottom, + VerticalTextAlignment = Alignment.End, Text = "Centered" }; labelVM.TextFormatter.WordWrap = false; @@ -167,7 +167,7 @@ public class TextAlignmentAndDirection : Scenario Height = 9, ColorScheme = color1, TextDirection = TextDirection.TopBottom_LeftRight, - VerticalTextAlignment = Alignment.Bottom, + VerticalTextAlignment = Alignment.End, Text = "Bottom" }; labelVB.TextFormatter.WordWrap = false; @@ -180,7 +180,7 @@ public class TextAlignmentAndDirection : Scenario Height = 9, ColorScheme = color1, TextDirection = TextDirection.TopBottom_LeftRight, - VerticalTextAlignment = Alignment.Bottom, + VerticalTextAlignment = Alignment.End, Text = "Justified" }; labelVJ.TextFormatter.WordWrap = false; @@ -193,7 +193,7 @@ public class TextAlignmentAndDirection : Scenario Height = Dim.Fill (1), ColorScheme = color1, TextDirection = TextDirection.TopBottom_LeftRight, - VerticalTextAlignment = Alignment.Top, + VerticalTextAlignment = Alignment.Start, Text = txt }; txtLabelVT.TextFormatter.WordWrap = false; @@ -206,7 +206,7 @@ public class TextAlignmentAndDirection : Scenario Height = Dim.Fill (1), ColorScheme = color2, TextDirection = TextDirection.TopBottom_LeftRight, - VerticalTextAlignment = Alignment.Centered, + VerticalTextAlignment = Alignment.Center, Text = txt }; txtLabelVM.TextFormatter.WordWrap = false; @@ -219,7 +219,7 @@ public class TextAlignmentAndDirection : Scenario Height = Dim.Fill (1), ColorScheme = color1, TextDirection = TextDirection.TopBottom_LeftRight, - VerticalTextAlignment = Alignment.Bottom, + VerticalTextAlignment = Alignment.End, Text = txt }; txtLabelVB.TextFormatter.WordWrap = false; @@ -232,7 +232,7 @@ public class TextAlignmentAndDirection : Scenario Height = Dim.Fill (1), ColorScheme = color2, TextDirection = TextDirection.TopBottom_LeftRight, - VerticalTextAlignment = Alignment.Justified, + VerticalTextAlignment = Alignment.Fill, Text = txt }; txtLabelVJ.TextFormatter.WordWrap = false; @@ -268,8 +268,8 @@ public class TextAlignmentAndDirection : Scenario Y = 1, Width = Dim.Percent (100 / 3), Height = Dim.Percent (100 / 3), - TextAlignment = Alignment.Left, - VerticalTextAlignment = Alignment.Top, + TextAlignment = Alignment.Start, + VerticalTextAlignment = Alignment.Start, ColorScheme = color1, Text = txt }; @@ -281,8 +281,8 @@ public class TextAlignmentAndDirection : Scenario Y = 1, Width = Dim.Percent (33), Height = Dim.Percent (33), - TextAlignment = Alignment.Centered, - VerticalTextAlignment = Alignment.Top, + TextAlignment = Alignment.Center, + VerticalTextAlignment = Alignment.Start, ColorScheme = color1, Text = txt }; @@ -294,8 +294,8 @@ public class TextAlignmentAndDirection : Scenario Y = 1, Width = Dim.Percent (100, DimPercentMode.Position), Height = Dim.Percent (33), - TextAlignment = Alignment.Right, - VerticalTextAlignment = Alignment.Top, + TextAlignment = Alignment.End, + VerticalTextAlignment = Alignment.Start, ColorScheme = color1, Text = txt }; @@ -307,8 +307,8 @@ public class TextAlignmentAndDirection : Scenario Y = Pos.Bottom (txtLabelTL) + 1, Width = Dim.Width (txtLabelTL), Height = Dim.Percent (33), - TextAlignment = Alignment.Left, - VerticalTextAlignment = Alignment.Centered, + TextAlignment = Alignment.Start, + VerticalTextAlignment = Alignment.Center, ColorScheme = color1, Text = txt }; @@ -320,8 +320,8 @@ public class TextAlignmentAndDirection : Scenario Y = Pos.Bottom (txtLabelTC) + 1, Width = Dim.Width (txtLabelTC), Height = Dim.Percent (33), - TextAlignment = Alignment.Centered, - VerticalTextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, + VerticalTextAlignment = Alignment.Center, ColorScheme = color1, Text = txt }; @@ -333,8 +333,8 @@ public class TextAlignmentAndDirection : Scenario Y = Pos.Bottom (txtLabelTR) + 1, Width = Dim.Percent (100, DimPercentMode.Position), Height = Dim.Percent (33), - TextAlignment = Alignment.Right, - VerticalTextAlignment = Alignment.Centered, + TextAlignment = Alignment.End, + VerticalTextAlignment = Alignment.Center, ColorScheme = color1, Text = txt }; @@ -346,8 +346,8 @@ public class TextAlignmentAndDirection : Scenario Y = Pos.Bottom (txtLabelML) + 1, Width = Dim.Width (txtLabelML), Height = Dim.Percent (100, DimPercentMode.Position), - TextAlignment = Alignment.Left, - VerticalTextAlignment = Alignment.Bottom, + TextAlignment = Alignment.Start, + VerticalTextAlignment = Alignment.End, ColorScheme = color1, Text = txt }; @@ -359,8 +359,8 @@ public class TextAlignmentAndDirection : Scenario Y = Pos.Bottom (txtLabelMC) + 1, Width = Dim.Width (txtLabelMC), Height = Dim.Percent (100, DimPercentMode.Position), - TextAlignment = Alignment.Centered, - VerticalTextAlignment = Alignment.Bottom, + TextAlignment = Alignment.Center, + VerticalTextAlignment = Alignment.End, ColorScheme = color1, Text = txt }; @@ -372,8 +372,8 @@ public class TextAlignmentAndDirection : Scenario Y = Pos.Bottom (txtLabelMR) + 1, Width = Dim.Percent (100, DimPercentMode.Position), Height = Dim.Percent (100, DimPercentMode.Position), - TextAlignment = Alignment.Right, - VerticalTextAlignment = Alignment.Bottom, + TextAlignment = Alignment.End, + VerticalTextAlignment = Alignment.End, ColorScheme = color1, Text = txt }; @@ -611,16 +611,16 @@ public class TextAlignmentAndDirection : Scenario switch (justifyOptions.SelectedItem) { case 0: - t.VerticalTextAlignment = Alignment.Justified; + t.VerticalTextAlignment = Alignment.Fill; t.TextAlignment = ((dynamic)t.Data).h; break; case 1: t.VerticalTextAlignment = (Alignment)((dynamic)t.Data).v; - t.TextAlignment = Alignment.Justified; + t.TextAlignment = Alignment.Fill; break; case 2: - t.VerticalTextAlignment = Alignment.Justified; - t.TextAlignment = Alignment.Justified; + t.VerticalTextAlignment = Alignment.Fill; + t.TextAlignment = Alignment.Fill; break; } } @@ -629,16 +629,16 @@ public class TextAlignmentAndDirection : Scenario switch (justifyOptions.SelectedItem) { case 0: - t.TextAlignment = Alignment.Justified; + t.TextAlignment = Alignment.Fill; t.VerticalTextAlignment = ((dynamic)t.Data).v; break; case 1: t.TextAlignment = (Alignment)((dynamic)t.Data).h; - t.VerticalTextAlignment = Alignment.Justified; + t.VerticalTextAlignment = Alignment.Fill; break; case 2: - t.TextAlignment = Alignment.Justified; - t.VerticalTextAlignment = Alignment.Justified; + t.TextAlignment = Alignment.Fill; + t.VerticalTextAlignment = Alignment.Fill; break; } } diff --git a/UICatalog/Scenarios/TextFormatterDemo.cs b/UICatalog/Scenarios/TextFormatterDemo.cs index ac5a8cb33..81bf6a839 100644 --- a/UICatalog/Scenarios/TextFormatterDemo.cs +++ b/UICatalog/Scenarios/TextFormatterDemo.cs @@ -75,7 +75,7 @@ public class TextFormatterDemo : Scenario } } - List alignments = new () { Alignment.Left, Alignment.Right, Alignment.Centered, Alignment.Justified }; + List alignments = new () { Alignment.Start, Alignment.End, Alignment.Center, Alignment.Fill }; Label [] singleLines = new Label [alignments.Count]; Label [] multipleLines = new Label [alignments.Count]; diff --git a/UICatalog/Scenarios/TimeAndDate.cs b/UICatalog/Scenarios/TimeAndDate.cs index c5b6117fe..4db2ace96 100644 --- a/UICatalog/Scenarios/TimeAndDate.cs +++ b/UICatalog/Scenarios/TimeAndDate.cs @@ -57,7 +57,7 @@ public class TimeAndDate : Scenario { X = Pos.Center (), Y = Pos.Bottom (longDate) + 1, - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = Dim.Fill (), Text = "Old Time: " @@ -68,7 +68,7 @@ public class TimeAndDate : Scenario { X = Pos.Center (), Y = Pos.Bottom (_lblOldTime) + 1, - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = Dim.Fill (), Text = "New Time: " @@ -79,7 +79,7 @@ public class TimeAndDate : Scenario { X = Pos.Center (), Y = Pos.Bottom (_lblNewTime) + 1, - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = Dim.Fill (), Text = "Time Format: " @@ -90,7 +90,7 @@ public class TimeAndDate : Scenario { X = Pos.Center (), Y = Pos.Bottom (_lblTimeFmt) + 2, - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = Dim.Fill (), Text = "Old Date: " @@ -101,7 +101,7 @@ public class TimeAndDate : Scenario { X = Pos.Center (), Y = Pos.Bottom (_lblOldDate) + 1, - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = Dim.Fill (), Text = "New Date: " @@ -112,7 +112,7 @@ public class TimeAndDate : Scenario { X = Pos.Center (), Y = Pos.Bottom (_lblNewDate) + 1, - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = Dim.Fill (), Text = "Date Format: " diff --git a/UICatalog/Scenarios/Unicode.cs b/UICatalog/Scenarios/Unicode.cs index 4f866f704..232f95edf 100644 --- a/UICatalog/Scenarios/Unicode.cs +++ b/UICatalog/Scenarios/Unicode.cs @@ -132,7 +132,7 @@ public class UnicodeInMenu : Scenario Width = Dim.Percent (50), Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = $"Justify Right - {gitString}" }; Win.Add (checkBox, checkBoxRight); diff --git a/UICatalog/Scenarios/ViewExperiments.cs b/UICatalog/Scenarios/ViewExperiments.cs index 170c60861..915a2b96a 100644 --- a/UICatalog/Scenarios/ViewExperiments.cs +++ b/UICatalog/Scenarios/ViewExperiments.cs @@ -60,7 +60,7 @@ public class ViewExperiments : Scenario Width = 17, Title = "Window 1", Text = "Window #2", - TextAlignment = Alignment.Centered + TextAlignment = Alignment.Center }; window1.Margin.Thickness = new (0); @@ -84,7 +84,7 @@ public class ViewExperiments : Scenario Width = 37, Title = "Window2", Text = "Window #2 (Right(window1)+1", - TextAlignment = Alignment.Centered + TextAlignment = Alignment.Center }; //view3.InitializeFrames (); @@ -109,7 +109,7 @@ public class ViewExperiments : Scenario Width = 37, Title = "View4", Text = "View #4 (Right(window2)+1", - TextAlignment = Alignment.Centered + TextAlignment = Alignment.Center }; //view4.InitializeFrames (); @@ -134,7 +134,7 @@ public class ViewExperiments : Scenario Width = Dim.Fill (), Title = "View5", Text = "View #5 (Right(view4)+1 Fill", - TextAlignment = Alignment.Centered + TextAlignment = Alignment.Center }; //view5.InitializeFrames (); @@ -181,7 +181,7 @@ public class ViewExperiments : Scenario X = Pos.Center (), Y = Pos.Percent (50), Width = 30, - TextAlignment = Alignment.Centered + TextAlignment = Alignment.Center }; label50.Border.Thickness = new (1, 3, 1, 1); label50.Height = 5; diff --git a/UICatalog/Scenarios/Wizards.cs b/UICatalog/Scenarios/Wizards.cs index d5c25b322..5fd52f4e8 100644 --- a/UICatalog/Scenarios/Wizards.cs +++ b/UICatalog/Scenarios/Wizards.cs @@ -21,7 +21,7 @@ public class Wizards : Scenario }; Win.Add (frame); - var label = new Label { X = 0, Y = 0, TextAlignment = Alignment.Right, Text = "Width:" }; + var label = new Label { X = 0, Y = 0, TextAlignment = Alignment.End, Text = "Width:" }; frame.Add (label); var widthEdit = new TextField @@ -41,7 +41,7 @@ public class Wizards : Scenario Width = Dim.Width (label), Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = "Height:" }; frame.Add (label); @@ -63,7 +63,7 @@ public class Wizards : Scenario Width = Dim.Width (label), Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Text = "Title:" }; frame.Add (label); @@ -88,7 +88,7 @@ public class Wizards : Scenario label = new() { - X = Pos.Center (), Y = Pos.AnchorEnd (1), TextAlignment = Alignment.Right, Text = "Action:" + X = Pos.Center (), Y = Pos.AnchorEnd (1), TextAlignment = Alignment.End, Text = "Action:" }; Win.Add (label); diff --git a/UnitTests/Configuration/ThemeScopeTests.cs b/UnitTests/Configuration/ThemeScopeTests.cs index 44bc169a5..7991da5e7 100644 --- a/UnitTests/Configuration/ThemeScopeTests.cs +++ b/UnitTests/Configuration/ThemeScopeTests.cs @@ -29,12 +29,12 @@ public class ThemeScopeTests { Reset (); Assert.NotEmpty (Themes); - Assert.Equal (Alignment.Right, Dialog.DefaultButtonAlignment); + Assert.Equal (Alignment.End, Dialog.DefaultButtonAlignment); - Themes ["Default"] ["Dialog.DefaultButtonAlignment"].PropertyValue = Alignment.Centered; + Themes ["Default"] ["Dialog.DefaultButtonAlignment"].PropertyValue = Alignment.Center; ThemeManager.Themes! [ThemeManager.SelectedTheme]!.Apply (); - Assert.Equal (Alignment.Centered, Dialog.DefaultButtonAlignment); + Assert.Equal (Alignment.Center, Dialog.DefaultButtonAlignment); Reset (); } diff --git a/UnitTests/Configuration/ThemeTests.cs b/UnitTests/Configuration/ThemeTests.cs index a285f5acc..99038bd86 100644 --- a/UnitTests/Configuration/ThemeTests.cs +++ b/UnitTests/Configuration/ThemeTests.cs @@ -77,14 +77,14 @@ public class ThemeTests public void TestSerialize_RoundTrip () { var theme = new ThemeScope (); - theme ["Dialog.DefaultButtonAlignment"].PropertyValue = Alignment.Right; + theme ["Dialog.DefaultButtonAlignment"].PropertyValue = Alignment.End; string json = JsonSerializer.Serialize (theme, _jsonOptions); var deserialized = JsonSerializer.Deserialize (json, _jsonOptions); Assert.Equal ( - Alignment.Right, + Alignment.End, (Alignment)deserialized ["Dialog.DefaultButtonAlignment"].PropertyValue ); Reset (); diff --git a/UnitTests/Dialogs/DialogTests.cs b/UnitTests/Dialogs/DialogTests.cs index c72ca857d..4152440bf 100644 --- a/UnitTests/Dialogs/DialogTests.cs +++ b/UnitTests/Dialogs/DialogTests.cs @@ -32,7 +32,7 @@ public class DialogTests Title = title, Width = width, Height = 1, - ButtonAlignment = Alignment.Centered, + ButtonAlignment = Alignment.Center, Buttons = [new Button { Text = btn1Text }] }; @@ -57,7 +57,7 @@ public class DialogTests Title = title, Width = width, Height = 1, - ButtonAlignment = Alignment.Justified, + ButtonAlignment = Alignment.Fill, Buttons = [new Button { Text = btn1Text }] }; @@ -82,7 +82,7 @@ public class DialogTests Title = title, Width = width, Height = 1, - ButtonAlignment = Alignment.Right, + ButtonAlignment = Alignment.End, Buttons = [new Button { Text = btn1Text }] }; @@ -107,7 +107,7 @@ public class DialogTests Title = title, Width = width, Height = 1, - ButtonAlignment = Alignment.Left, + ButtonAlignment = Alignment.Start, Buttons = [new Button { Text = btn1Text }] }; @@ -155,7 +155,7 @@ public class DialogTests (runstate, Dialog dlg) = RunButtonTestDialog ( title, width, - Alignment.Centered, + Alignment.Center, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -172,7 +172,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Justified, + Alignment.Fill, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -189,7 +189,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Right, + Alignment.End, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -206,7 +206,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Left, + Alignment.Start, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -248,7 +248,7 @@ public class DialogTests (runstate, Dialog dlg) = RunButtonTestDialog ( title, width, - Alignment.Centered, + Alignment.Center, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -266,7 +266,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Justified, + Alignment.Fill, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -283,7 +283,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Right, + Alignment.End, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -299,7 +299,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Left, + Alignment.Start, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -340,7 +340,7 @@ public class DialogTests (runstate, Dialog dlg) = RunButtonTestDialog ( title, width, - Alignment.Centered, + Alignment.Center, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -357,7 +357,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Justified, + Alignment.Fill, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -374,7 +374,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Right, + Alignment.End, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -391,7 +391,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Left, + Alignment.Start, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -434,7 +434,7 @@ public class DialogTests (runstate, Dialog dlg) = RunButtonTestDialog ( title, width, - Alignment.Centered, + Alignment.Center, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -451,7 +451,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Justified, + Alignment.Fill, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -468,7 +468,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Right, + Alignment.End, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -485,7 +485,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Left, + Alignment.Start, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text }, @@ -517,7 +517,7 @@ public class DialogTests (runstate, Dialog dlg) = RunButtonTestDialog ( title, width, - Alignment.Centered, + Alignment.Center, new Button { Text = btnText } ); @@ -534,7 +534,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Justified, + Alignment.Fill, new Button { Text = btnText } ); TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output); @@ -549,7 +549,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Right, + Alignment.End, new Button { Text = btnText } ); TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output); @@ -564,7 +564,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Left, + Alignment.Start, new Button { Text = btnText } ); TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output); @@ -581,7 +581,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Centered, + Alignment.Center, new Button { Text = btnText } ); TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output); @@ -596,7 +596,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Justified, + Alignment.Fill, new Button { Text = btnText } ); TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output); @@ -611,7 +611,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Right, + Alignment.End, new Button { Text = btnText } ); TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output); @@ -626,7 +626,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Left, + Alignment.Start, new Button { Text = btnText } ); TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output); @@ -660,7 +660,7 @@ public class DialogTests (runstate, Dialog dlg) = RunButtonTestDialog ( title, width, - Alignment.Centered, + Alignment.Center, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text } @@ -676,7 +676,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Justified, + Alignment.Fill, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text } @@ -692,7 +692,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Right, + Alignment.End, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text } @@ -708,7 +708,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Left, + Alignment.Start, new Button { Text = btn1Text }, new Button { Text = btn2Text }, new Button { Text = btn3Text } @@ -742,7 +742,7 @@ public class DialogTests (runstate, Dialog dlg) = RunButtonTestDialog ( title, width, - Alignment.Centered, + Alignment.Center, new Button { Text = btn1Text }, new Button { Text = btn2Text } ); @@ -757,7 +757,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Justified, + Alignment.Fill, new Button { Text = btn1Text }, new Button { Text = btn2Text } ); @@ -772,7 +772,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Right, + Alignment.End, new Button { Text = btn1Text }, new Button { Text = btn2Text } ); @@ -787,7 +787,7 @@ public class DialogTests (runstate, dlg) = RunButtonTestDialog ( title, width, - Alignment.Left, + Alignment.Start, new Button { Text = btn1Text }, new Button { Text = btn2Text } ); @@ -824,7 +824,7 @@ public class DialogTests // Default (Center) button1 = new Button { Text = btn1Text }; button2 = new Button { Text = btn2Text }; - (runstate, dlg) = RunButtonTestDialog (title, width, Alignment.Centered, button1, button2); + (runstate, dlg) = RunButtonTestDialog (title, width, Alignment.Center, button1, button2); button1.Visible = false; RunIteration (ref runstate, ref firstIteration); buttonRow = $@"{CM.Glyphs.VLine} {btn2} {CM.Glyphs.VLine}"; @@ -836,7 +836,7 @@ public class DialogTests Assert.Equal (width, buttonRow.Length); button1 = new Button { Text = btn1Text }; button2 = new Button { Text = btn2Text }; - (runstate, dlg) = RunButtonTestDialog (title, width, Alignment.Justified, button1, button2); + (runstate, dlg) = RunButtonTestDialog (title, width, Alignment.Fill, button1, button2); button1.Visible = false; RunIteration (ref runstate, ref firstIteration); buttonRow = $@"{CM.Glyphs.VLine} {btn2}{CM.Glyphs.VLine}"; @@ -848,7 +848,7 @@ public class DialogTests Assert.Equal (width, buttonRow.Length); button1 = new Button { Text = btn1Text }; button2 = new Button { Text = btn2Text }; - (runstate, dlg) = RunButtonTestDialog (title, width, Alignment.Right, button1, button2); + (runstate, dlg) = RunButtonTestDialog (title, width, Alignment.End, button1, button2); button1.Visible = false; RunIteration (ref runstate, ref firstIteration); TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output); @@ -859,7 +859,7 @@ public class DialogTests Assert.Equal (width, buttonRow.Length); button1 = new Button { Text = btn1Text }; button2 = new Button { Text = btn2Text }; - (runstate, dlg) = RunButtonTestDialog (title, width, Alignment.Left, button1, button2); + (runstate, dlg) = RunButtonTestDialog (title, width, Alignment.Start, button1, button2); button1.Visible = false; RunIteration (ref runstate, ref firstIteration); buttonRow = $@"{CM.Glyphs.VLine} {btn2} {CM.Glyphs.VLine}"; @@ -889,7 +889,7 @@ public class DialogTests win.Loaded += (s, a) => { - Dialog.DefaultButtonAlignment = Alignment.Centered; + Dialog.DefaultButtonAlignment = Alignment.Center; var dlg = new Dialog { Width = 18, Height = 3, Buttons = [new () { Text = "Ok" }] }; dlg.Loaded += (s, a) => @@ -973,7 +973,7 @@ public class DialogTests var win = new Window (); int iterations = -1; - Dialog.DefaultButtonAlignment = Alignment.Centered; + Dialog.DefaultButtonAlignment = Alignment.Center; Iteration += (s, a) => { @@ -1008,7 +1008,7 @@ public class DialogTests public void Dialog_Opened_From_Another_Dialog () { ((FakeDriver)Driver).SetBufferSize (30, 10); - Dialog.DefaultButtonAlignment = Alignment.Centered; + Dialog.DefaultButtonAlignment = Alignment.Center; var btn1 = new Button { Text = "press me 1" }; Button btn2 = null; @@ -1285,7 +1285,7 @@ public class DialogTests (runstate, Dialog _) = RunButtonTestDialog ( title, width, - Alignment.Centered, + Alignment.Center, new Button { Text = btnText } ); TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output); @@ -1338,7 +1338,7 @@ public class DialogTests int width = buttonRow.Length; d.SetBufferSize (buttonRow.Length, 3); - (runstate, Dialog dlg) = RunButtonTestDialog (title, width, Alignment.Centered, null); + (runstate, Dialog dlg) = RunButtonTestDialog (title, width, Alignment.Center, null); TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output); End (runstate); diff --git a/UnitTests/Drawing/AlignerTests.cs b/UnitTests/Drawing/AlignerTests.cs index cc4564a95..8e8f93cec 100644 --- a/UnitTests/Drawing/AlignerTests.cs +++ b/UnitTests/Drawing/AlignerTests.cs @@ -62,172 +62,172 @@ public class AlignerTests (ITestOutputHelper output) } [Theory] - [InlineData (Alignment.Left, new [] { 0 }, 1, new [] { 0 })] - [InlineData (Alignment.Left, new [] { 0, 0 }, 1, new [] { 0, 1 })] - [InlineData (Alignment.Left, new [] { 0, 0, 0 }, 1, new [] { 0, 1, 1 })] - [InlineData (Alignment.Left, new [] { 1 }, 1, new [] { 0 })] - [InlineData (Alignment.Left, new [] { 1 }, 2, new [] { 0 })] - [InlineData (Alignment.Left, new [] { 1 }, 3, new [] { 0 })] - [InlineData (Alignment.Left, new [] { 1, 1 }, 2, new [] { 0, 1 })] - [InlineData (Alignment.Left, new [] { 1, 1 }, 3, new [] { 0, 2 })] - [InlineData (Alignment.Left, new [] { 1, 1 }, 4, new [] { 0, 2 })] - [InlineData (Alignment.Left, new [] { 1, 1, 1 }, 3, new [] { 0, 1, 2 })] - [InlineData (Alignment.Left, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] - [InlineData (Alignment.Left, new [] { 1, 2, 3 }, 7, new [] { 0, 2, 4 })] - [InlineData (Alignment.Left, new [] { 1, 2, 3 }, 10, new [] { 0, 2, 5 })] - [InlineData (Alignment.Left, new [] { 1, 2, 3 }, 11, new [] { 0, 2, 5 })] - [InlineData (Alignment.Left, new [] { 1, 2, 3 }, 12, new [] { 0, 2, 5 })] - [InlineData (Alignment.Left, new [] { 1, 2, 3 }, 13, new [] { 0, 2, 5 })] + [InlineData (Alignment.Start, new [] { 0 }, 1, new [] { 0 })] + [InlineData (Alignment.Start, new [] { 0, 0 }, 1, new [] { 0, 1 })] + [InlineData (Alignment.Start, new [] { 0, 0, 0 }, 1, new [] { 0, 1, 1 })] + [InlineData (Alignment.Start, new [] { 1 }, 1, new [] { 0 })] + [InlineData (Alignment.Start, new [] { 1 }, 2, new [] { 0 })] + [InlineData (Alignment.Start, new [] { 1 }, 3, new [] { 0 })] + [InlineData (Alignment.Start, new [] { 1, 1 }, 2, new [] { 0, 1 })] + [InlineData (Alignment.Start, new [] { 1, 1 }, 3, new [] { 0, 2 })] + [InlineData (Alignment.Start, new [] { 1, 1 }, 4, new [] { 0, 2 })] + [InlineData (Alignment.Start, new [] { 1, 1, 1 }, 3, new [] { 0, 1, 2 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3 }, 7, new [] { 0, 2, 4 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3 }, 10, new [] { 0, 2, 5 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3 }, 11, new [] { 0, 2, 5 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3 }, 12, new [] { 0, 2, 5 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3 }, 13, new [] { 0, 2, 5 })] [InlineData ( - Alignment.Left, + Alignment.Start, new [] { 1, 2, 3 }, 5, new [] { 0, 1, 3 })] // 5 is too small to fit the items. The first item is at 0, the items to the right are clipped. - [InlineData (Alignment.Left, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] - [InlineData (Alignment.Left, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 2, 4, 7 })] - [InlineData (Alignment.Left, new [] { 33, 33, 33 }, 100, new [] { 0, 34, 67 })] - [InlineData (Alignment.Left, new [] { 10 }, 101, new [] { 0 })] - [InlineData (Alignment.Left, new [] { 10, 20 }, 101, new [] { 0, 11 })] - [InlineData (Alignment.Left, new [] { 10, 20, 30 }, 100, new [] { 0, 11, 32 })] - [InlineData (Alignment.Left, new [] { 10, 20, 30 }, 101, new [] { 0, 11, 32 })] - [InlineData (Alignment.Left, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 11, 31, 61 })] - [InlineData (Alignment.Left, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 11, 31, 61, 101 })] - [InlineData (Alignment.Right, new [] { 0 }, 1, new [] { 1 })] - [InlineData (Alignment.Right, new [] { 0, 0 }, 1, new [] { 0, 1 })] - [InlineData (Alignment.Right, new [] { 0, 0, 0 }, 1, new [] { 0, 1, 1 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3 }, 7, new [] { 0, 2, 4 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3 }, 10, new [] { 2, 4, 7 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3 }, 11, new [] { 3, 5, 8 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3 }, 12, new [] { 4, 6, 9 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3 }, 13, new [] { 5, 7, 10 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3 }, 5, new [] { -1, 0, 2 })] // 5 is too small to fit the items. The first item is at -1. - [InlineData (Alignment.Right, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 2, 4, 7 })] - [InlineData (Alignment.Right, new [] { 10, 20, 30 }, 100, new [] { 38, 49, 70 })] - [InlineData (Alignment.Right, new [] { 33, 33, 33 }, 100, new [] { 0, 34, 67 })] - [InlineData (Alignment.Right, new [] { 10 }, 101, new [] { 91 })] - [InlineData (Alignment.Right, new [] { 10, 20 }, 101, new [] { 70, 81 })] - [InlineData (Alignment.Right, new [] { 10, 20, 30 }, 101, new [] { 39, 50, 71 })] - [InlineData (Alignment.Right, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 11, 31, 61 })] - [InlineData (Alignment.Right, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 11, 31, 61, 101 })] - [InlineData (Alignment.Centered, new [] { 0 }, 1, new [] { 0 })] - [InlineData (Alignment.Centered, new [] { 0, 0 }, 1, new [] { 0, 1 })] - [InlineData (Alignment.Centered, new [] { 0, 0, 0 }, 1, new [] { 0, 1, 1 })] - [InlineData (Alignment.Centered, new [] { 1 }, 1, new [] { 0 })] - [InlineData (Alignment.Centered, new [] { 1 }, 2, new [] { 0 })] - [InlineData (Alignment.Centered, new [] { 1 }, 3, new [] { 1 })] - [InlineData (Alignment.Centered, new [] { 1, 1 }, 2, new [] { 0, 1 })] - [InlineData (Alignment.Centered, new [] { 1, 1 }, 3, new [] { 0, 2 })] - [InlineData (Alignment.Centered, new [] { 1, 1 }, 4, new [] { 0, 2 })] - [InlineData (Alignment.Centered, new [] { 1, 1, 1 }, 3, new [] { 0, 1, 2 })] - [InlineData (Alignment.Centered, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] - [InlineData (Alignment.Centered, new [] { 1, 2, 3 }, 7, new [] { 0, 2, 4 })] - [InlineData (Alignment.Centered, new [] { 1, 2, 3 }, 10, new [] { 1, 3, 6 })] - [InlineData (Alignment.Centered, new [] { 1, 2, 3 }, 11, new [] { 1, 3, 6 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 2, 4, 7 })] + [InlineData (Alignment.Start, new [] { 33, 33, 33 }, 100, new [] { 0, 34, 67 })] + [InlineData (Alignment.Start, new [] { 10 }, 101, new [] { 0 })] + [InlineData (Alignment.Start, new [] { 10, 20 }, 101, new [] { 0, 11 })] + [InlineData (Alignment.Start, new [] { 10, 20, 30 }, 100, new [] { 0, 11, 32 })] + [InlineData (Alignment.Start, new [] { 10, 20, 30 }, 101, new [] { 0, 11, 32 })] + [InlineData (Alignment.Start, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 11, 31, 61 })] + [InlineData (Alignment.Start, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 11, 31, 61, 101 })] + [InlineData (Alignment.End, new [] { 0 }, 1, new [] { 1 })] + [InlineData (Alignment.End, new [] { 0, 0 }, 1, new [] { 0, 1 })] + [InlineData (Alignment.End, new [] { 0, 0, 0 }, 1, new [] { 0, 1, 1 })] + [InlineData (Alignment.End, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] + [InlineData (Alignment.End, new [] { 1, 2, 3 }, 7, new [] { 0, 2, 4 })] + [InlineData (Alignment.End, new [] { 1, 2, 3 }, 10, new [] { 2, 4, 7 })] + [InlineData (Alignment.End, new [] { 1, 2, 3 }, 11, new [] { 3, 5, 8 })] + [InlineData (Alignment.End, new [] { 1, 2, 3 }, 12, new [] { 4, 6, 9 })] + [InlineData (Alignment.End, new [] { 1, 2, 3 }, 13, new [] { 5, 7, 10 })] + [InlineData (Alignment.End, new [] { 1, 2, 3 }, 5, new [] { -1, 0, 2 })] // 5 is too small to fit the items. The first item is at -1. + [InlineData (Alignment.End, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] + [InlineData (Alignment.End, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 2, 4, 7 })] + [InlineData (Alignment.End, new [] { 10, 20, 30 }, 100, new [] { 38, 49, 70 })] + [InlineData (Alignment.End, new [] { 33, 33, 33 }, 100, new [] { 0, 34, 67 })] + [InlineData (Alignment.End, new [] { 10 }, 101, new [] { 91 })] + [InlineData (Alignment.End, new [] { 10, 20 }, 101, new [] { 70, 81 })] + [InlineData (Alignment.End, new [] { 10, 20, 30 }, 101, new [] { 39, 50, 71 })] + [InlineData (Alignment.End, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 11, 31, 61 })] + [InlineData (Alignment.End, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 11, 31, 61, 101 })] + [InlineData (Alignment.Center, new [] { 0 }, 1, new [] { 0 })] + [InlineData (Alignment.Center, new [] { 0, 0 }, 1, new [] { 0, 1 })] + [InlineData (Alignment.Center, new [] { 0, 0, 0 }, 1, new [] { 0, 1, 1 })] + [InlineData (Alignment.Center, new [] { 1 }, 1, new [] { 0 })] + [InlineData (Alignment.Center, new [] { 1 }, 2, new [] { 0 })] + [InlineData (Alignment.Center, new [] { 1 }, 3, new [] { 1 })] + [InlineData (Alignment.Center, new [] { 1, 1 }, 2, new [] { 0, 1 })] + [InlineData (Alignment.Center, new [] { 1, 1 }, 3, new [] { 0, 2 })] + [InlineData (Alignment.Center, new [] { 1, 1 }, 4, new [] { 0, 2 })] + [InlineData (Alignment.Center, new [] { 1, 1, 1 }, 3, new [] { 0, 1, 2 })] + [InlineData (Alignment.Center, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] + [InlineData (Alignment.Center, new [] { 1, 2, 3 }, 7, new [] { 0, 2, 4 })] + [InlineData (Alignment.Center, new [] { 1, 2, 3 }, 10, new [] { 1, 3, 6 })] + [InlineData (Alignment.Center, new [] { 1, 2, 3 }, 11, new [] { 1, 3, 6 })] [InlineData ( - Alignment.Centered, + Alignment.Center, new [] { 1, 2, 3 }, 5, new [] { 0, 1, 3 })] // 5 is too small to fit the items. The first item is at 0, the items to the right are clipped. - [InlineData (Alignment.Centered, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] - [InlineData (Alignment.Centered, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 2, 4, 7 })] - [InlineData (Alignment.Centered, new [] { 3, 3, 3 }, 9, new [] { 0, 3, 6 })] - [InlineData (Alignment.Centered, new [] { 3, 3, 3 }, 10, new [] { 0, 4, 7 })] - [InlineData (Alignment.Centered, new [] { 3, 3, 3 }, 11, new [] { 0, 4, 8 })] - [InlineData (Alignment.Centered, new [] { 3, 3, 3 }, 12, new [] { 0, 4, 8 })] - [InlineData (Alignment.Centered, new [] { 3, 3, 3 }, 13, new [] { 1, 5, 9 })] - [InlineData (Alignment.Centered, new [] { 33, 33, 33 }, 100, new [] { 0, 34, 67 })] - [InlineData (Alignment.Centered, new [] { 33, 33, 33 }, 101, new [] { 0, 34, 68 })] - [InlineData (Alignment.Centered, new [] { 33, 33, 33 }, 102, new [] { 0, 34, 68 })] - [InlineData (Alignment.Centered, new [] { 33, 33, 33 }, 103, new [] { 1, 35, 69 })] - [InlineData (Alignment.Centered, new [] { 33, 33, 33 }, 104, new [] { 1, 35, 69 })] - [InlineData (Alignment.Centered, new [] { 10 }, 101, new [] { 45 })] - [InlineData (Alignment.Centered, new [] { 10, 20 }, 101, new [] { 35, 46 })] - [InlineData (Alignment.Centered, new [] { 10, 20, 30 }, 100, new [] { 19, 30, 51 })] - [InlineData (Alignment.Centered, new [] { 10, 20, 30 }, 101, new [] { 19, 30, 51 })] - [InlineData (Alignment.Centered, new [] { 10, 20, 30, 40 }, 100, new [] { 0, 10, 30, 60 })] - [InlineData (Alignment.Centered, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 11, 31, 61 })] - [InlineData (Alignment.Centered, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 11, 31, 61, 101 })] - [InlineData (Alignment.Centered, new [] { 3, 4, 5, 6 }, 25, new [] { 2, 6, 11, 17 })] - [InlineData (Alignment.Justified, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 11, 31, 61, 101 })] - [InlineData (Alignment.Justified, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 11, 31, 61 })] - [InlineData (Alignment.Justified, new [] { 10, 20, 30 }, 100, new [] { 0, 30, 70 })] - [InlineData (Alignment.Justified, new [] { 10, 20, 30 }, 101, new [] { 0, 31, 71 })] - [InlineData (Alignment.Justified, new [] { 33, 33, 33 }, 100, new [] { 0, 34, 67 })] - [InlineData (Alignment.Justified, new [] { 11, 17, 23 }, 100, new [] { 0, 36, 77 })] - [InlineData (Alignment.Justified, new [] { 1, 2, 3 }, 11, new [] { 0, 4, 8 })] - [InlineData (Alignment.Justified, new [] { 10, 20 }, 101, new [] { 0, 81 })] - [InlineData (Alignment.Justified, new [] { 10 }, 101, new [] { 0 })] - [InlineData (Alignment.Justified, new [] { 3, 3, 3 }, 21, new [] { 0, 9, 18 })] - [InlineData (Alignment.Justified, new [] { 3, 4, 5 }, 21, new [] { 0, 8, 16 })] - [InlineData (Alignment.Justified, new [] { 3, 4, 5, 6 }, 18, new [] { 0, 3, 7, 12 })] - [InlineData (Alignment.Justified, new [] { 3, 4, 5, 6 }, 19, new [] { 0, 4, 8, 13 })] - [InlineData (Alignment.Justified, new [] { 3, 4, 5, 6 }, 20, new [] { 0, 4, 9, 14 })] - [InlineData (Alignment.Justified, new [] { 3, 4, 5, 6 }, 21, new [] { 0, 4, 9, 15 })] - [InlineData (Alignment.Justified, new [] { 6, 5, 4, 3 }, 22, new [] { 0, 8, 14, 19 })] - [InlineData (Alignment.Justified, new [] { 6, 5, 4, 3 }, 23, new [] { 0, 8, 15, 20 })] - [InlineData (Alignment.Justified, new [] { 6, 5, 4, 3 }, 24, new [] { 0, 8, 15, 21 })] - [InlineData (Alignment.Justified, new [] { 6, 5, 4, 3 }, 25, new [] { 0, 9, 16, 22 })] - [InlineData (Alignment.Justified, new [] { 6, 5, 4, 3 }, 26, new [] { 0, 9, 17, 23 })] - [InlineData (Alignment.Justified, new [] { 6, 5, 4, 3 }, 31, new [] { 0, 11, 20, 28 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 0 }, 1, new [] { 1 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 0, 0 }, 1, new [] { 0, 1 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 0, 0, 0 }, 1, new [] { 0, 1, 1 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1 }, 1, new [] { 0 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1 }, 2, new [] { 1 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1 }, 3, new [] { 2 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 1 }, 2, new [] { 0, 1 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 1 }, 3, new [] { 0, 2 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 1 }, 4, new [] { 0, 3 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 1, 1 }, 3, new [] { 0, 1, 2 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3 }, 7, new [] { 0, 2, 4 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3 }, 8, new [] { 0, 2, 5 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3 }, 9, new [] { 0, 2, 6 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3 }, 10, new [] { 0, 2, 7 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3 }, 11, new [] { 0, 2, 8 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3 }, 5, new [] { -1, 0, 2 })] // 5 is too small to fit the items. The first item is at -1.})] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 2, 4, 7 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 3, 3, 3 }, 21, new [] { 0, 4, 18 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 3, 4, 5 }, 21, new [] { 0, 4, 16 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 33, 33, 33 }, 100, new [] { 0, 34, 67 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 10 }, 101, new [] { 91 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 10, 20 }, 101, new [] { 0, 81 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 10, 20, 30 }, 100, new [] { 0, 11, 70 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 10, 20, 30 }, 101, new [] { 0, 11, 71 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 11, 31, 61 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 11, 31, 61, 101 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 0 }, 1, new [] { 0 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 0, 0 }, 1, new [] { 0, 1 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 0, 0, 0 }, 1, new [] { 0, 0, 1 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1 }, 1, new [] { 0 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1 }, 2, new [] { 0 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1 }, 3, new [] { 0 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 1 }, 2, new [] { 0, 1 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 1 }, 3, new [] { 0, 2 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 1 }, 4, new [] { 0, 3 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 1, 1 }, 3, new [] { 0, 1, 2 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3 }, 7, new [] { 0, 1, 4 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3 }, 8, new [] { 0, 2, 5 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3 }, 9, new [] { 0, 3, 6 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3 }, 10, new [] { 0, 4, 7 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3 }, 11, new [] { 0, 5, 8 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3 }, 5, new [] { 0, 1, 3 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 1, 3, 7 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3, 4 }, 12, new [] { 0, 1, 4, 8 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 3, 3, 3 }, 21, new [] { 0, 14, 18 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 3, 4, 5 }, 21, new [] { 0, 11, 16 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 33, 33, 33 }, 100, new [] { 0, 33, 67 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 10 }, 101, new [] { 0 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 10, 20 }, 101, new [] { 0, 81 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 10, 20, 30 }, 100, new [] { 0, 49, 70 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 10, 20, 30 }, 101, new [] { 0, 50, 71 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 10, 30, 61 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 10, 30, 60, 101 })] + [InlineData (Alignment.Center, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] + [InlineData (Alignment.Center, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 2, 4, 7 })] + [InlineData (Alignment.Center, new [] { 3, 3, 3 }, 9, new [] { 0, 3, 6 })] + [InlineData (Alignment.Center, new [] { 3, 3, 3 }, 10, new [] { 0, 4, 7 })] + [InlineData (Alignment.Center, new [] { 3, 3, 3 }, 11, new [] { 0, 4, 8 })] + [InlineData (Alignment.Center, new [] { 3, 3, 3 }, 12, new [] { 0, 4, 8 })] + [InlineData (Alignment.Center, new [] { 3, 3, 3 }, 13, new [] { 1, 5, 9 })] + [InlineData (Alignment.Center, new [] { 33, 33, 33 }, 100, new [] { 0, 34, 67 })] + [InlineData (Alignment.Center, new [] { 33, 33, 33 }, 101, new [] { 0, 34, 68 })] + [InlineData (Alignment.Center, new [] { 33, 33, 33 }, 102, new [] { 0, 34, 68 })] + [InlineData (Alignment.Center, new [] { 33, 33, 33 }, 103, new [] { 1, 35, 69 })] + [InlineData (Alignment.Center, new [] { 33, 33, 33 }, 104, new [] { 1, 35, 69 })] + [InlineData (Alignment.Center, new [] { 10 }, 101, new [] { 45 })] + [InlineData (Alignment.Center, new [] { 10, 20 }, 101, new [] { 35, 46 })] + [InlineData (Alignment.Center, new [] { 10, 20, 30 }, 100, new [] { 19, 30, 51 })] + [InlineData (Alignment.Center, new [] { 10, 20, 30 }, 101, new [] { 19, 30, 51 })] + [InlineData (Alignment.Center, new [] { 10, 20, 30, 40 }, 100, new [] { 0, 10, 30, 60 })] + [InlineData (Alignment.Center, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 11, 31, 61 })] + [InlineData (Alignment.Center, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 11, 31, 61, 101 })] + [InlineData (Alignment.Center, new [] { 3, 4, 5, 6 }, 25, new [] { 2, 6, 11, 17 })] + [InlineData (Alignment.Fill, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 11, 31, 61, 101 })] + [InlineData (Alignment.Fill, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 11, 31, 61 })] + [InlineData (Alignment.Fill, new [] { 10, 20, 30 }, 100, new [] { 0, 30, 70 })] + [InlineData (Alignment.Fill, new [] { 10, 20, 30 }, 101, new [] { 0, 31, 71 })] + [InlineData (Alignment.Fill, new [] { 33, 33, 33 }, 100, new [] { 0, 34, 67 })] + [InlineData (Alignment.Fill, new [] { 11, 17, 23 }, 100, new [] { 0, 36, 77 })] + [InlineData (Alignment.Fill, new [] { 1, 2, 3 }, 11, new [] { 0, 4, 8 })] + [InlineData (Alignment.Fill, new [] { 10, 20 }, 101, new [] { 0, 81 })] + [InlineData (Alignment.Fill, new [] { 10 }, 101, new [] { 0 })] + [InlineData (Alignment.Fill, new [] { 3, 3, 3 }, 21, new [] { 0, 9, 18 })] + [InlineData (Alignment.Fill, new [] { 3, 4, 5 }, 21, new [] { 0, 8, 16 })] + [InlineData (Alignment.Fill, new [] { 3, 4, 5, 6 }, 18, new [] { 0, 3, 7, 12 })] + [InlineData (Alignment.Fill, new [] { 3, 4, 5, 6 }, 19, new [] { 0, 4, 8, 13 })] + [InlineData (Alignment.Fill, new [] { 3, 4, 5, 6 }, 20, new [] { 0, 4, 9, 14 })] + [InlineData (Alignment.Fill, new [] { 3, 4, 5, 6 }, 21, new [] { 0, 4, 9, 15 })] + [InlineData (Alignment.Fill, new [] { 6, 5, 4, 3 }, 22, new [] { 0, 8, 14, 19 })] + [InlineData (Alignment.Fill, new [] { 6, 5, 4, 3 }, 23, new [] { 0, 8, 15, 20 })] + [InlineData (Alignment.Fill, new [] { 6, 5, 4, 3 }, 24, new [] { 0, 8, 15, 21 })] + [InlineData (Alignment.Fill, new [] { 6, 5, 4, 3 }, 25, new [] { 0, 9, 16, 22 })] + [InlineData (Alignment.Fill, new [] { 6, 5, 4, 3 }, 26, new [] { 0, 9, 17, 23 })] + [InlineData (Alignment.Fill, new [] { 6, 5, 4, 3 }, 31, new [] { 0, 11, 20, 28 })] + [InlineData (Alignment.LastEndRestStart, new [] { 0 }, 1, new [] { 1 })] + [InlineData (Alignment.LastEndRestStart, new [] { 0, 0 }, 1, new [] { 0, 1 })] + [InlineData (Alignment.LastEndRestStart, new [] { 0, 0, 0 }, 1, new [] { 0, 1, 1 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1 }, 1, new [] { 0 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1 }, 2, new [] { 1 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1 }, 3, new [] { 2 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 1 }, 2, new [] { 0, 1 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 1 }, 3, new [] { 0, 2 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 1 }, 4, new [] { 0, 3 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 1, 1 }, 3, new [] { 0, 1, 2 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3 }, 7, new [] { 0, 2, 4 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3 }, 8, new [] { 0, 2, 5 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3 }, 9, new [] { 0, 2, 6 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3 }, 10, new [] { 0, 2, 7 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3 }, 11, new [] { 0, 2, 8 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3 }, 5, new [] { -1, 0, 2 })] // 5 is too small to fit the items. The first item is at -1.})] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 2, 4, 7 })] + [InlineData (Alignment.LastEndRestStart, new [] { 3, 3, 3 }, 21, new [] { 0, 4, 18 })] + [InlineData (Alignment.LastEndRestStart, new [] { 3, 4, 5 }, 21, new [] { 0, 4, 16 })] + [InlineData (Alignment.LastEndRestStart, new [] { 33, 33, 33 }, 100, new [] { 0, 34, 67 })] + [InlineData (Alignment.LastEndRestStart, new [] { 10 }, 101, new [] { 91 })] + [InlineData (Alignment.LastEndRestStart, new [] { 10, 20 }, 101, new [] { 0, 81 })] + [InlineData (Alignment.LastEndRestStart, new [] { 10, 20, 30 }, 100, new [] { 0, 11, 70 })] + [InlineData (Alignment.LastEndRestStart, new [] { 10, 20, 30 }, 101, new [] { 0, 11, 71 })] + [InlineData (Alignment.LastEndRestStart, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 11, 31, 61 })] + [InlineData (Alignment.LastEndRestStart, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 11, 31, 61, 101 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 0 }, 1, new [] { 0 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 0, 0 }, 1, new [] { 0, 1 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 0, 0, 0 }, 1, new [] { 0, 0, 1 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1 }, 1, new [] { 0 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1 }, 2, new [] { 0 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1 }, 3, new [] { 0 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 1 }, 2, new [] { 0, 1 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 1 }, 3, new [] { 0, 2 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 1 }, 4, new [] { 0, 3 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 1, 1 }, 3, new [] { 0, 1, 2 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3 }, 7, new [] { 0, 1, 4 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3 }, 8, new [] { 0, 2, 5 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3 }, 9, new [] { 0, 3, 6 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3 }, 10, new [] { 0, 4, 7 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3 }, 11, new [] { 0, 5, 8 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3 }, 5, new [] { 0, 1, 3 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 1, 3, 7 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3, 4 }, 12, new [] { 0, 1, 4, 8 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 3, 3, 3 }, 21, new [] { 0, 14, 18 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 3, 4, 5 }, 21, new [] { 0, 11, 16 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 33, 33, 33 }, 100, new [] { 0, 33, 67 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 10 }, 101, new [] { 0 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 10, 20 }, 101, new [] { 0, 81 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 10, 20, 30 }, 100, new [] { 0, 49, 70 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 10, 20, 30 }, 101, new [] { 0, 50, 71 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 10, 30, 61 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 10, 30, 60, 101 })] public void Alignment_SpaceBetweenItems (Alignment alignment, int [] sizes, int containerSize, int [] expected) { int [] positions = new Aligner @@ -240,154 +240,154 @@ public class AlignerTests (ITestOutputHelper output) } [Theory] - [InlineData (Alignment.Left, new [] { 0 }, 1, new [] { 0 })] - [InlineData (Alignment.Left, new [] { 0, 0 }, 1, new [] { 0, 0 })] - [InlineData (Alignment.Left, new [] { 0, 0, 0 }, 1, new [] { 0, 0, 0 })] - [InlineData (Alignment.Left, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] - [InlineData (Alignment.Left, new [] { 1, 2, 3 }, 7, new [] { 0, 1, 3 })] - [InlineData (Alignment.Left, new [] { 1, 2, 3 }, 10, new [] { 0, 1, 3 })] - [InlineData (Alignment.Left, new [] { 1, 2, 3 }, 11, new [] { 0, 1, 3 })] - [InlineData (Alignment.Left, new [] { 1, 2, 3 }, 12, new [] { 0, 1, 3 })] - [InlineData (Alignment.Left, new [] { 1, 2, 3 }, 13, new [] { 0, 1, 3 })] - [InlineData (Alignment.Left, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] - [InlineData (Alignment.Left, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 1, 3, 6 })] + [InlineData (Alignment.Start, new [] { 0 }, 1, new [] { 0 })] + [InlineData (Alignment.Start, new [] { 0, 0 }, 1, new [] { 0, 0 })] + [InlineData (Alignment.Start, new [] { 0, 0, 0 }, 1, new [] { 0, 0, 0 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3 }, 7, new [] { 0, 1, 3 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3 }, 10, new [] { 0, 1, 3 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3 }, 11, new [] { 0, 1, 3 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3 }, 12, new [] { 0, 1, 3 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3 }, 13, new [] { 0, 1, 3 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] + [InlineData (Alignment.Start, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 1, 3, 6 })] [InlineData ( - Alignment.Left, + Alignment.Start, new [] { 1, 2, 3 }, 5, new [] { 0, 1, 3 })] // 5 is too small to fit the items. The first item is at 0, the items to the right are clipped. - [InlineData (Alignment.Left, new [] { 10, 20, 30 }, 100, new [] { 0, 10, 30 })] - [InlineData (Alignment.Left, new [] { 33, 33, 33 }, 100, new [] { 0, 33, 66 })] - [InlineData (Alignment.Left, new [] { 10 }, 101, new [] { 0 })] - [InlineData (Alignment.Left, new [] { 10, 20 }, 101, new [] { 0, 10 })] - [InlineData (Alignment.Left, new [] { 10, 20, 30 }, 101, new [] { 0, 10, 30 })] - [InlineData (Alignment.Left, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 10, 30, 60 })] - [InlineData (Alignment.Left, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 10, 30, 60, 100 })] - [InlineData (Alignment.Right, new [] { 0 }, 1, new [] { 1 })] - [InlineData (Alignment.Right, new [] { 0, 0 }, 1, new [] { 1, 1 })] - [InlineData (Alignment.Right, new [] { 0, 0, 0 }, 1, new [] { 1, 1, 1 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3 }, 7, new [] { 1, 2, 4 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3 }, 10, new [] { 4, 5, 7 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3 }, 11, new [] { 5, 6, 8 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3 }, 12, new [] { 6, 7, 9 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3 }, 13, new [] { 7, 8, 10 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3 }, 5, new [] { -1, 0, 2 })] // 5 is too small to fit the items. The first item is at -1. - [InlineData (Alignment.Right, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] - [InlineData (Alignment.Right, new [] { 1, 2, 3, 4 }, 11, new [] { 1, 2, 4, 7 })] - [InlineData (Alignment.Right, new [] { 10, 20, 30 }, 100, new [] { 40, 50, 70 })] - [InlineData (Alignment.Right, new [] { 33, 33, 33 }, 100, new [] { 1, 34, 67 })] - [InlineData (Alignment.Right, new [] { 10 }, 101, new [] { 91 })] - [InlineData (Alignment.Right, new [] { 10, 20 }, 101, new [] { 71, 81 })] - [InlineData (Alignment.Right, new [] { 10, 20, 30 }, 101, new [] { 41, 51, 71 })] - [InlineData (Alignment.Right, new [] { 10, 20, 30, 40 }, 101, new [] { 1, 11, 31, 61 })] - [InlineData (Alignment.Right, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 1, 11, 31, 61, 101 })] - [InlineData (Alignment.Centered, new [] { 1 }, 1, new [] { 0 })] - [InlineData (Alignment.Centered, new [] { 1 }, 2, new [] { 0 })] - [InlineData (Alignment.Centered, new [] { 1 }, 3, new [] { 1 })] - [InlineData (Alignment.Centered, new [] { 1, 1 }, 2, new [] { 0, 1 })] - [InlineData (Alignment.Centered, new [] { 1, 1 }, 3, new [] { 0, 1 })] - [InlineData (Alignment.Centered, new [] { 1, 1 }, 4, new [] { 1, 2 })] - [InlineData (Alignment.Centered, new [] { 1, 1, 1 }, 3, new [] { 0, 1, 2 })] - [InlineData (Alignment.Centered, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] - [InlineData (Alignment.Centered, new [] { 1, 2, 3 }, 7, new [] { 0, 1, 3 })] - [InlineData (Alignment.Centered, new [] { 1, 2, 3 }, 10, new [] { 2, 3, 5 })] - [InlineData (Alignment.Centered, new [] { 1, 2, 3 }, 11, new [] { 2, 3, 5 })] - [InlineData (Alignment.Centered, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] - [InlineData (Alignment.Centered, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 1, 3, 6 })] - [InlineData (Alignment.Centered, new [] { 3, 3, 3 }, 9, new [] { 0, 3, 6 })] - [InlineData (Alignment.Centered, new [] { 3, 3, 3 }, 10, new [] { 0, 3, 6 })] - [InlineData (Alignment.Centered, new [] { 3, 3, 3 }, 11, new [] { 1, 4, 7 })] - [InlineData (Alignment.Centered, new [] { 3, 3, 3 }, 12, new [] { 1, 4, 7 })] - [InlineData (Alignment.Centered, new [] { 3, 3, 3 }, 13, new [] { 2, 5, 8 })] + [InlineData (Alignment.Start, new [] { 10, 20, 30 }, 100, new [] { 0, 10, 30 })] + [InlineData (Alignment.Start, new [] { 33, 33, 33 }, 100, new [] { 0, 33, 66 })] + [InlineData (Alignment.Start, new [] { 10 }, 101, new [] { 0 })] + [InlineData (Alignment.Start, new [] { 10, 20 }, 101, new [] { 0, 10 })] + [InlineData (Alignment.Start, new [] { 10, 20, 30 }, 101, new [] { 0, 10, 30 })] + [InlineData (Alignment.Start, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 10, 30, 60 })] + [InlineData (Alignment.Start, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 10, 30, 60, 100 })] + [InlineData (Alignment.End, new [] { 0 }, 1, new [] { 1 })] + [InlineData (Alignment.End, new [] { 0, 0 }, 1, new [] { 1, 1 })] + [InlineData (Alignment.End, new [] { 0, 0, 0 }, 1, new [] { 1, 1, 1 })] + [InlineData (Alignment.End, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] + [InlineData (Alignment.End, new [] { 1, 2, 3 }, 7, new [] { 1, 2, 4 })] + [InlineData (Alignment.End, new [] { 1, 2, 3 }, 10, new [] { 4, 5, 7 })] + [InlineData (Alignment.End, new [] { 1, 2, 3 }, 11, new [] { 5, 6, 8 })] + [InlineData (Alignment.End, new [] { 1, 2, 3 }, 12, new [] { 6, 7, 9 })] + [InlineData (Alignment.End, new [] { 1, 2, 3 }, 13, new [] { 7, 8, 10 })] + [InlineData (Alignment.End, new [] { 1, 2, 3 }, 5, new [] { -1, 0, 2 })] // 5 is too small to fit the items. The first item is at -1. + [InlineData (Alignment.End, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] + [InlineData (Alignment.End, new [] { 1, 2, 3, 4 }, 11, new [] { 1, 2, 4, 7 })] + [InlineData (Alignment.End, new [] { 10, 20, 30 }, 100, new [] { 40, 50, 70 })] + [InlineData (Alignment.End, new [] { 33, 33, 33 }, 100, new [] { 1, 34, 67 })] + [InlineData (Alignment.End, new [] { 10 }, 101, new [] { 91 })] + [InlineData (Alignment.End, new [] { 10, 20 }, 101, new [] { 71, 81 })] + [InlineData (Alignment.End, new [] { 10, 20, 30 }, 101, new [] { 41, 51, 71 })] + [InlineData (Alignment.End, new [] { 10, 20, 30, 40 }, 101, new [] { 1, 11, 31, 61 })] + [InlineData (Alignment.End, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 1, 11, 31, 61, 101 })] + [InlineData (Alignment.Center, new [] { 1 }, 1, new [] { 0 })] + [InlineData (Alignment.Center, new [] { 1 }, 2, new [] { 0 })] + [InlineData (Alignment.Center, new [] { 1 }, 3, new [] { 1 })] + [InlineData (Alignment.Center, new [] { 1, 1 }, 2, new [] { 0, 1 })] + [InlineData (Alignment.Center, new [] { 1, 1 }, 3, new [] { 0, 1 })] + [InlineData (Alignment.Center, new [] { 1, 1 }, 4, new [] { 1, 2 })] + [InlineData (Alignment.Center, new [] { 1, 1, 1 }, 3, new [] { 0, 1, 2 })] + [InlineData (Alignment.Center, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] + [InlineData (Alignment.Center, new [] { 1, 2, 3 }, 7, new [] { 0, 1, 3 })] + [InlineData (Alignment.Center, new [] { 1, 2, 3 }, 10, new [] { 2, 3, 5 })] + [InlineData (Alignment.Center, new [] { 1, 2, 3 }, 11, new [] { 2, 3, 5 })] + [InlineData (Alignment.Center, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] + [InlineData (Alignment.Center, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 1, 3, 6 })] + [InlineData (Alignment.Center, new [] { 3, 3, 3 }, 9, new [] { 0, 3, 6 })] + [InlineData (Alignment.Center, new [] { 3, 3, 3 }, 10, new [] { 0, 3, 6 })] + [InlineData (Alignment.Center, new [] { 3, 3, 3 }, 11, new [] { 1, 4, 7 })] + [InlineData (Alignment.Center, new [] { 3, 3, 3 }, 12, new [] { 1, 4, 7 })] + [InlineData (Alignment.Center, new [] { 3, 3, 3 }, 13, new [] { 2, 5, 8 })] [InlineData ( - Alignment.Centered, + Alignment.Center, new [] { 1, 2, 3 }, 5, new [] { 0, 1, 3 })] // 5 is too small to fit the items. The first item is at 0, the items to the right are clipped. - [InlineData (Alignment.Centered, new [] { 33, 33, 33 }, 100, new [] { 0, 33, 66 })] - [InlineData (Alignment.Centered, new [] { 33, 33, 33 }, 101, new [] { 1, 34, 67 })] - [InlineData (Alignment.Centered, new [] { 33, 33, 33 }, 102, new [] { 1, 34, 67 })] - [InlineData (Alignment.Centered, new [] { 33, 33, 33 }, 103, new [] { 2, 35, 68 })] - [InlineData (Alignment.Centered, new [] { 33, 33, 33 }, 104, new [] { 2, 35, 68 })] - [InlineData (Alignment.Centered, new [] { 3, 4, 5, 6 }, 25, new [] { 3, 6, 10, 15 })] - [InlineData (Alignment.Justified, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 11, 31, 61, 101 })] - [InlineData (Alignment.Justified, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 11, 31, 61 })] - [InlineData (Alignment.Justified, new [] { 10, 20, 30 }, 100, new [] { 0, 30, 70 })] - [InlineData (Alignment.Justified, new [] { 10, 20, 30 }, 101, new [] { 0, 31, 71 })] - [InlineData (Alignment.Justified, new [] { 33, 33, 33 }, 100, new [] { 0, 34, 67 })] - [InlineData (Alignment.Justified, new [] { 11, 17, 23 }, 100, new [] { 0, 36, 77 })] - [InlineData (Alignment.Justified, new [] { 1, 2, 3 }, 11, new [] { 0, 4, 8 })] - [InlineData (Alignment.Justified, new [] { 10, 20 }, 101, new [] { 0, 81 })] - [InlineData (Alignment.Justified, new [] { 10 }, 101, new [] { 0 })] - [InlineData (Alignment.Justified, new [] { 3, 3, 3 }, 21, new [] { 0, 9, 18 })] - [InlineData (Alignment.Justified, new [] { 3, 4, 5 }, 21, new [] { 0, 8, 16 })] - [InlineData (Alignment.Justified, new [] { 3, 4, 5, 6 }, 18, new [] { 0, 3, 7, 12 })] - [InlineData (Alignment.Justified, new [] { 3, 4, 5, 6 }, 19, new [] { 0, 4, 8, 13 })] - [InlineData (Alignment.Justified, new [] { 3, 4, 5, 6 }, 20, new [] { 0, 4, 9, 14 })] - [InlineData (Alignment.Justified, new [] { 3, 4, 5, 6 }, 21, new [] { 0, 4, 9, 15 })] - [InlineData (Alignment.Justified, new [] { 6, 5, 4, 3 }, 22, new [] { 0, 8, 14, 19 })] - [InlineData (Alignment.Justified, new [] { 6, 5, 4, 3 }, 23, new [] { 0, 8, 15, 20 })] - [InlineData (Alignment.Justified, new [] { 6, 5, 4, 3 }, 24, new [] { 0, 8, 15, 21 })] - [InlineData (Alignment.Justified, new [] { 6, 5, 4, 3 }, 25, new [] { 0, 9, 16, 22 })] - [InlineData (Alignment.Justified, new [] { 6, 5, 4, 3 }, 26, new [] { 0, 9, 17, 23 })] - [InlineData (Alignment.Justified, new [] { 6, 5, 4, 3 }, 31, new [] { 0, 11, 20, 28 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 0 }, 1, new [] { 1 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 0, 0 }, 1, new [] { 0, 1 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 0, 0, 0 }, 1, new [] { 0, 0, 1 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1 }, 1, new [] { 0 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1 }, 2, new [] { 1 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1 }, 3, new [] { 2 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 1 }, 2, new [] { 0, 1 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 1 }, 3, new [] { 0, 2 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 1 }, 4, new [] { 0, 3 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 1, 1 }, 3, new [] { 0, 1, 2 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3 }, 7, new [] { 0, 1, 4 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3 }, 8, new [] { 0, 1, 5 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3 }, 9, new [] { 0, 1, 6 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3 }, 10, new [] { 0, 1, 7 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3 }, 11, new [] { 0, 1, 8 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 1, 3, 7 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 1, 2, 3, 4 }, 12, new [] { 0, 1, 3, 8 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 3, 3, 3 }, 21, new [] { 0, 3, 18 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 3, 4, 5 }, 21, new [] { 0, 3, 16 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 33, 33, 33 }, 100, new [] { 0, 33, 67 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 10 }, 101, new [] { 91 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 10, 20 }, 101, new [] { 0, 81 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 10, 20, 30 }, 100, new [] { 0, 10, 70 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 10, 20, 30 }, 101, new [] { 0, 10, 71 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 10, 30, 61 })] - [InlineData (Alignment.LastRightRestLeft, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 10, 30, 60, 101 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 0 }, 1, new [] { 0 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 0, 0 }, 1, new [] { 0, 1 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 0, 0, 0 }, 1, new [] { 0, 1, 1 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1 }, 1, new [] { 0 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1 }, 2, new [] { 0 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1 }, 3, new [] { 0 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 1 }, 2, new [] { 0, 1 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 1 }, 3, new [] { 0, 2 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 1 }, 4, new [] { 0, 3 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 1, 1 }, 3, new [] { 0, 1, 2 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3 }, 7, new [] { 0, 2, 4 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3 }, 8, new [] { 0, 3, 5 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3 }, 9, new [] { 0, 4, 6 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3 }, 10, new [] { 0, 5, 7 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3 }, 11, new [] { 0, 6, 8 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 2, 4, 7 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 1, 2, 3, 4 }, 12, new [] { 0, 3, 5, 8 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 3, 3, 3 }, 21, new [] { 0, 15, 18 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 3, 4, 5 }, 21, new [] { 0, 12, 16 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 33, 33, 33 }, 100, new [] { 0, 34, 67 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 10 }, 101, new [] { 0 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 10, 20 }, 101, new [] { 0, 81 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 10, 20, 30 }, 100, new [] { 0, 50, 70 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 10, 20, 30 }, 101, new [] { 0, 51, 71 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 11, 31, 61 })] - [InlineData (Alignment.FirstLeftRestRight, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 11, 31, 61, 101 })] + [InlineData (Alignment.Center, new [] { 33, 33, 33 }, 100, new [] { 0, 33, 66 })] + [InlineData (Alignment.Center, new [] { 33, 33, 33 }, 101, new [] { 1, 34, 67 })] + [InlineData (Alignment.Center, new [] { 33, 33, 33 }, 102, new [] { 1, 34, 67 })] + [InlineData (Alignment.Center, new [] { 33, 33, 33 }, 103, new [] { 2, 35, 68 })] + [InlineData (Alignment.Center, new [] { 33, 33, 33 }, 104, new [] { 2, 35, 68 })] + [InlineData (Alignment.Center, new [] { 3, 4, 5, 6 }, 25, new [] { 3, 6, 10, 15 })] + [InlineData (Alignment.Fill, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 11, 31, 61, 101 })] + [InlineData (Alignment.Fill, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 11, 31, 61 })] + [InlineData (Alignment.Fill, new [] { 10, 20, 30 }, 100, new [] { 0, 30, 70 })] + [InlineData (Alignment.Fill, new [] { 10, 20, 30 }, 101, new [] { 0, 31, 71 })] + [InlineData (Alignment.Fill, new [] { 33, 33, 33 }, 100, new [] { 0, 34, 67 })] + [InlineData (Alignment.Fill, new [] { 11, 17, 23 }, 100, new [] { 0, 36, 77 })] + [InlineData (Alignment.Fill, new [] { 1, 2, 3 }, 11, new [] { 0, 4, 8 })] + [InlineData (Alignment.Fill, new [] { 10, 20 }, 101, new [] { 0, 81 })] + [InlineData (Alignment.Fill, new [] { 10 }, 101, new [] { 0 })] + [InlineData (Alignment.Fill, new [] { 3, 3, 3 }, 21, new [] { 0, 9, 18 })] + [InlineData (Alignment.Fill, new [] { 3, 4, 5 }, 21, new [] { 0, 8, 16 })] + [InlineData (Alignment.Fill, new [] { 3, 4, 5, 6 }, 18, new [] { 0, 3, 7, 12 })] + [InlineData (Alignment.Fill, new [] { 3, 4, 5, 6 }, 19, new [] { 0, 4, 8, 13 })] + [InlineData (Alignment.Fill, new [] { 3, 4, 5, 6 }, 20, new [] { 0, 4, 9, 14 })] + [InlineData (Alignment.Fill, new [] { 3, 4, 5, 6 }, 21, new [] { 0, 4, 9, 15 })] + [InlineData (Alignment.Fill, new [] { 6, 5, 4, 3 }, 22, new [] { 0, 8, 14, 19 })] + [InlineData (Alignment.Fill, new [] { 6, 5, 4, 3 }, 23, new [] { 0, 8, 15, 20 })] + [InlineData (Alignment.Fill, new [] { 6, 5, 4, 3 }, 24, new [] { 0, 8, 15, 21 })] + [InlineData (Alignment.Fill, new [] { 6, 5, 4, 3 }, 25, new [] { 0, 9, 16, 22 })] + [InlineData (Alignment.Fill, new [] { 6, 5, 4, 3 }, 26, new [] { 0, 9, 17, 23 })] + [InlineData (Alignment.Fill, new [] { 6, 5, 4, 3 }, 31, new [] { 0, 11, 20, 28 })] + [InlineData (Alignment.LastEndRestStart, new [] { 0 }, 1, new [] { 1 })] + [InlineData (Alignment.LastEndRestStart, new [] { 0, 0 }, 1, new [] { 0, 1 })] + [InlineData (Alignment.LastEndRestStart, new [] { 0, 0, 0 }, 1, new [] { 0, 0, 1 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1 }, 1, new [] { 0 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1 }, 2, new [] { 1 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1 }, 3, new [] { 2 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 1 }, 2, new [] { 0, 1 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 1 }, 3, new [] { 0, 2 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 1 }, 4, new [] { 0, 3 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 1, 1 }, 3, new [] { 0, 1, 2 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3 }, 7, new [] { 0, 1, 4 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3 }, 8, new [] { 0, 1, 5 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3 }, 9, new [] { 0, 1, 6 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3 }, 10, new [] { 0, 1, 7 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3 }, 11, new [] { 0, 1, 8 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 1, 3, 7 })] + [InlineData (Alignment.LastEndRestStart, new [] { 1, 2, 3, 4 }, 12, new [] { 0, 1, 3, 8 })] + [InlineData (Alignment.LastEndRestStart, new [] { 3, 3, 3 }, 21, new [] { 0, 3, 18 })] + [InlineData (Alignment.LastEndRestStart, new [] { 3, 4, 5 }, 21, new [] { 0, 3, 16 })] + [InlineData (Alignment.LastEndRestStart, new [] { 33, 33, 33 }, 100, new [] { 0, 33, 67 })] + [InlineData (Alignment.LastEndRestStart, new [] { 10 }, 101, new [] { 91 })] + [InlineData (Alignment.LastEndRestStart, new [] { 10, 20 }, 101, new [] { 0, 81 })] + [InlineData (Alignment.LastEndRestStart, new [] { 10, 20, 30 }, 100, new [] { 0, 10, 70 })] + [InlineData (Alignment.LastEndRestStart, new [] { 10, 20, 30 }, 101, new [] { 0, 10, 71 })] + [InlineData (Alignment.LastEndRestStart, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 10, 30, 61 })] + [InlineData (Alignment.LastEndRestStart, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 10, 30, 60, 101 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 0 }, 1, new [] { 0 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 0, 0 }, 1, new [] { 0, 1 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 0, 0, 0 }, 1, new [] { 0, 1, 1 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1 }, 1, new [] { 0 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1 }, 2, new [] { 0 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1 }, 3, new [] { 0 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 1 }, 2, new [] { 0, 1 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 1 }, 3, new [] { 0, 2 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 1 }, 4, new [] { 0, 3 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 1, 1 }, 3, new [] { 0, 1, 2 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3 }, 6, new [] { 0, 1, 3 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3 }, 7, new [] { 0, 2, 4 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3 }, 8, new [] { 0, 3, 5 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3 }, 9, new [] { 0, 4, 6 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3 }, 10, new [] { 0, 5, 7 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3 }, 11, new [] { 0, 6, 8 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3, 4 }, 10, new [] { 0, 1, 3, 6 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3, 4 }, 11, new [] { 0, 2, 4, 7 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 1, 2, 3, 4 }, 12, new [] { 0, 3, 5, 8 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 3, 3, 3 }, 21, new [] { 0, 15, 18 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 3, 4, 5 }, 21, new [] { 0, 12, 16 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 33, 33, 33 }, 100, new [] { 0, 34, 67 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 10 }, 101, new [] { 0 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 10, 20 }, 101, new [] { 0, 81 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 10, 20, 30 }, 100, new [] { 0, 50, 70 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 10, 20, 30 }, 101, new [] { 0, 51, 71 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 10, 20, 30, 40 }, 101, new [] { 0, 11, 31, 61 })] + [InlineData (Alignment.FirstStartRestEnd, new [] { 10, 20, 30, 40, 50 }, 151, new [] { 0, 11, 31, 61, 101 })] public void Alignment_NoSpaceBetweenItems (Alignment alignment, int [] sizes, int containerSize, int [] expected) { int [] positions = new Aligner diff --git a/UnitTests/Text/TextFormatterTests.cs b/UnitTests/Text/TextFormatterTests.cs index cdbd44244..6746f8ad7 100644 --- a/UnitTests/Text/TextFormatterTests.cs +++ b/UnitTests/Text/TextFormatterTests.cs @@ -53,36 +53,36 @@ public class TextFormatterTests tf.Text = testText; Size expectedSize = new (testText.Length, 1); Assert.Equal (testText, tf.Text); - Assert.Equal (Alignment.Left, tf.Alignment); + Assert.Equal (Alignment.Start, tf.Alignment); Assert.Equal (expectedSize, tf.Size); tf.Draw (testBounds, new Attribute (), new Attribute ()); Assert.Equal (expectedSize, tf.Size); Assert.NotEmpty (tf.GetLines ()); - tf.Alignment = Alignment.Right; + tf.Alignment = Alignment.End; expectedSize = new (testText.Length, 1); Assert.Equal (testText, tf.Text); - Assert.Equal (Alignment.Right, tf.Alignment); + Assert.Equal (Alignment.End, tf.Alignment); Assert.Equal (expectedSize, tf.Size); tf.Draw (testBounds, new Attribute (), new Attribute ()); Assert.Equal (expectedSize, tf.Size); Assert.NotEmpty (tf.GetLines ()); - tf.Alignment = Alignment.Right; + tf.Alignment = Alignment.End; expectedSize = new (testText.Length, 1); tf.Size = expectedSize; Assert.Equal (testText, tf.Text); - Assert.Equal (Alignment.Right, tf.Alignment); + Assert.Equal (Alignment.End, tf.Alignment); Assert.Equal (expectedSize, tf.Size); tf.Draw (testBounds, new Attribute (), new Attribute ()); Assert.Equal (expectedSize, tf.Size); Assert.NotEmpty (tf.GetLines ()); - tf.Alignment = Alignment.Centered; + tf.Alignment = Alignment.Center; expectedSize = new (testText.Length, 1); tf.Size = expectedSize; Assert.Equal (testText, tf.Text); - Assert.Equal (Alignment.Centered, tf.Alignment); + Assert.Equal (Alignment.Center, tf.Alignment); Assert.Equal (expectedSize, tf.Size); tf.Draw (testBounds, new Attribute (), new Attribute ()); Assert.Equal (expectedSize, tf.Size); @@ -191,12 +191,12 @@ public class TextFormatterTests public void ClipAndJustify_Invalid_Returns_Original (string text) { string expected = string.IsNullOrEmpty (text) ? text : ""; - Assert.Equal (expected, TextFormatter.ClipAndJustify (text, 0, Alignment.Left)); - Assert.Equal (expected, TextFormatter.ClipAndJustify (text, 0, Alignment.Left)); + Assert.Equal (expected, TextFormatter.ClipAndJustify (text, 0, Alignment.Start)); + Assert.Equal (expected, TextFormatter.ClipAndJustify (text, 0, Alignment.Start)); Assert.Throws ( () => - TextFormatter.ClipAndJustify (text, -1, Alignment.Left) + TextFormatter.ClipAndJustify (text, -1, Alignment.Start) ); } @@ -219,7 +219,7 @@ public class TextFormatterTests [InlineData ("Ð ÑÐ", "Ð Ñ", 3)] // Should not fit public void ClipAndJustify_Valid_Centered (string text, string justifiedText, int maxWidth) { - var alignment = Alignment.Centered; + var alignment = Alignment.Center; var textDirection = TextDirection.LeftRight_TopBottom; var tabWidth = 1; @@ -277,7 +277,7 @@ public class TextFormatterTests [InlineData ("Ð ÑÐ", "Ð Ñ", 3)] // Should not fit public void ClipAndJustify_Valid_Justified (string text, string justifiedText, int maxWidth) { - var alignment = Alignment.Justified; + var alignment = Alignment.Fill; var textDirection = TextDirection.LeftRight_TopBottom; var tabWidth = 1; @@ -328,7 +328,7 @@ public class TextFormatterTests [InlineData ("Ð ÑÐ", "Ð Ñ", 3)] // Should not fit public void ClipAndJustify_Valid_Left (string text, string justifiedText, int maxWidth) { - var alignment = Alignment.Left; + var alignment = Alignment.Start; var textDirection = TextDirection.LeftRight_BottomTop; var tabWidth = 1; @@ -377,7 +377,7 @@ public class TextFormatterTests [InlineData ("Ð ÑÐ", "Ð Ñ", 3)] // Should not fit public void ClipAndJustify_Valid_Right (string text, string justifiedText, int maxWidth) { - var alignment = Alignment.Right; + var alignment = Alignment.End; var textDirection = TextDirection.LeftRight_BottomTop; var tabWidth = 1; @@ -757,7 +757,7 @@ ssb TextFormatter.Format ( "Some text", 4, - Alignment.Left, + Alignment.Start, false, true ) @@ -785,7 +785,7 @@ ssb for (int i = text.GetRuneCount (); i < maxWidth; i++) { - fmtText = TextFormatter.Format (text, i, Alignment.Justified, false, true) [0]; + fmtText = TextFormatter.Format (text, i, Alignment.Fill, false, true) [0]; Assert.Equal (i, fmtText.GetRuneCount ()); char c = fmtText [^1]; Assert.True (text.EndsWith (c)); @@ -817,7 +817,7 @@ ssb fmtText = TextFormatter.Format ( text, i, - Alignment.Justified, + Alignment.Fill, false, true, 0, @@ -862,7 +862,7 @@ ssb " A sentence has words. \n This is the second Line - 2. ", 4, -50, - Alignment.Left, + Alignment.Start, true, false, new [] { " A", "sent", "ence", "has", "word", "s. ", " Thi", "s is", "the", "seco", "nd", "Line", "- 2." }, @@ -872,7 +872,7 @@ ssb " A sentence has words. \n This is the second Line - 2. ", 4, -50, - Alignment.Left, + Alignment.Start, true, true, new [] @@ -1336,18 +1336,18 @@ ssb Assert.NotEmpty (tf.GetLines ()); Assert.False (tf.NeedsFormat); // get_Lines causes a Format - tf.Alignment = Alignment.Centered; + tf.Alignment = Alignment.Center; Assert.True (tf.NeedsFormat); Assert.NotEmpty (tf.GetLines ()); Assert.False (tf.NeedsFormat); // get_Lines causes a Format } [Theory] - [InlineData ("", -1, Alignment.Left, false, 0)] - [InlineData (null, 0, Alignment.Left, false, 1)] - [InlineData (null, 0, Alignment.Left, true, 1)] - [InlineData ("", 0, Alignment.Left, false, 1)] - [InlineData ("", 0, Alignment.Left, true, 1)] + [InlineData ("", -1, Alignment.Start, false, 0)] + [InlineData (null, 0, Alignment.Start, false, 1)] + [InlineData (null, 0, Alignment.Start, true, 1)] + [InlineData ("", 0, Alignment.Start, false, 1)] + [InlineData ("", 0, Alignment.Start, true, 1)] public void Reformat_Invalid (string text, int maxWidth, Alignment alignment, bool wrap, int linesCount) { if (maxWidth < 0) @@ -1367,20 +1367,20 @@ ssb } [Theory] - [InlineData ("A sentence has words.\nLine 2.", 0, -29, Alignment.Left, false, 1, true)] - [InlineData ("A sentence has words.\nLine 2.", 1, -28, Alignment.Left, false, 1, false)] - [InlineData ("A sentence has words.\nLine 2.", 5, -24, Alignment.Left, false, 1, false)] - [InlineData ("A sentence has words.\nLine 2.", 28, -1, Alignment.Left, false, 1, false)] + [InlineData ("A sentence has words.\nLine 2.", 0, -29, Alignment.Start, false, 1, true)] + [InlineData ("A sentence has words.\nLine 2.", 1, -28, Alignment.Start, false, 1, false)] + [InlineData ("A sentence has words.\nLine 2.", 5, -24, Alignment.Start, false, 1, false)] + [InlineData ("A sentence has words.\nLine 2.", 28, -1, Alignment.Start, false, 1, false)] // no clip - [InlineData ("A sentence has words.\nLine 2.", 29, 0, Alignment.Left, false, 1, false)] - [InlineData ("A sentence has words.\nLine 2.", 30, 1, Alignment.Left, false, 1, false)] - [InlineData ("A sentence has words.\r\nLine 2.", 0, -30, Alignment.Left, false, 1, true)] - [InlineData ("A sentence has words.\r\nLine 2.", 1, -29, Alignment.Left, false, 1, false)] - [InlineData ("A sentence has words.\r\nLine 2.", 5, -25, Alignment.Left, false, 1, false)] - [InlineData ("A sentence has words.\r\nLine 2.", 29, -1, Alignment.Left, false, 1, false, 1)] - [InlineData ("A sentence has words.\r\nLine 2.", 30, 0, Alignment.Left, false, 1, false)] - [InlineData ("A sentence has words.\r\nLine 2.", 31, 1, Alignment.Left, false, 1, false)] + [InlineData ("A sentence has words.\nLine 2.", 29, 0, Alignment.Start, false, 1, false)] + [InlineData ("A sentence has words.\nLine 2.", 30, 1, Alignment.Start, false, 1, false)] + [InlineData ("A sentence has words.\r\nLine 2.", 0, -30, Alignment.Start, false, 1, true)] + [InlineData ("A sentence has words.\r\nLine 2.", 1, -29, Alignment.Start, false, 1, false)] + [InlineData ("A sentence has words.\r\nLine 2.", 5, -25, Alignment.Start, false, 1, false)] + [InlineData ("A sentence has words.\r\nLine 2.", 29, -1, Alignment.Start, false, 1, false, 1)] + [InlineData ("A sentence has words.\r\nLine 2.", 30, 0, Alignment.Start, false, 1, false)] + [InlineData ("A sentence has words.\r\nLine 2.", 31, 1, Alignment.Start, false, 1, false)] public void Reformat_NoWordrap_NewLines_MultiLine_False ( string text, int maxWidth, @@ -1430,12 +1430,12 @@ ssb } [Theory] - [InlineData ("A sentence has words.\nLine 2.", 0, -29, Alignment.Left, false, 1, true, new [] { "" })] + [InlineData ("A sentence has words.\nLine 2.", 0, -29, Alignment.Start, false, 1, true, new [] { "" })] [InlineData ( "A sentence has words.\nLine 2.", 1, -28, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1445,7 +1445,7 @@ ssb "A sentence has words.\nLine 2.", 5, -24, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1455,7 +1455,7 @@ ssb "A sentence has words.\nLine 2.", 28, -1, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1466,7 +1466,7 @@ ssb "A sentence has words.\nLine 2.", 29, 0, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1476,18 +1476,18 @@ ssb "A sentence has words.\nLine 2.", 30, 1, - Alignment.Left, + Alignment.Start, false, 2, false, new [] { "A sentence has words.", "Line 2." } )] - [InlineData ("A sentence has words.\r\nLine 2.", 0, -30, Alignment.Left, false, 1, true, new [] { "" })] + [InlineData ("A sentence has words.\r\nLine 2.", 0, -30, Alignment.Start, false, 1, true, new [] { "" })] [InlineData ( "A sentence has words.\r\nLine 2.", 1, -29, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1497,7 +1497,7 @@ ssb "A sentence has words.\r\nLine 2.", 5, -25, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1507,7 +1507,7 @@ ssb "A sentence has words.\r\nLine 2.", 29, -1, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1517,7 +1517,7 @@ ssb "A sentence has words.\r\nLine 2.", 30, 0, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1527,7 +1527,7 @@ ssb "A sentence has words.\r\nLine 2.", 31, 1, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1572,12 +1572,12 @@ ssb } [Theory] - [InlineData ("A sentence has words.\nLine 2.", 0, -29, Alignment.Left, false, 1, true, new [] { "" })] + [InlineData ("A sentence has words.\nLine 2.", 0, -29, Alignment.Start, false, 1, true, new [] { "" })] [InlineData ( "A sentence has words.\nLine 2.", 1, -28, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1587,7 +1587,7 @@ ssb "A sentence has words.\nLine 2.", 5, -24, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1597,7 +1597,7 @@ ssb "A sentence has words.\nLine 2.", 28, -1, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1608,7 +1608,7 @@ ssb "A sentence has words.\nLine 2.", 29, 0, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1618,18 +1618,18 @@ ssb "A sentence has words.\nLine 2.", 30, 1, - Alignment.Left, + Alignment.Start, false, 2, false, new [] { "A sentence has words.", "Line 2." } )] - [InlineData ("A sentence has words.\r\nLine 2.", 0, -30, Alignment.Left, false, 1, true, new [] { "" })] + [InlineData ("A sentence has words.\r\nLine 2.", 0, -30, Alignment.Start, false, 1, true, new [] { "" })] [InlineData ( "A sentence has words.\r\nLine 2.", 1, -29, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1639,7 +1639,7 @@ ssb "A sentence has words.\r\nLine 2.", 5, -25, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1649,7 +1649,7 @@ ssb "A sentence has words.\r\nLine 2.", 29, -1, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1659,7 +1659,7 @@ ssb "A sentence has words.\r\nLine 2.", 30, 0, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1669,7 +1669,7 @@ ssb "A sentence has words.\r\nLine 2.", 31, 1, - Alignment.Left, + Alignment.Start, false, 2, false, @@ -1714,16 +1714,16 @@ ssb } [Theory] - [InlineData ("", 0, 0, Alignment.Left, false, 1, true)] - [InlineData ("", 1, 1, Alignment.Left, false, 1, true)] - [InlineData ("A sentence has words.", 0, -21, Alignment.Left, false, 1, true)] - [InlineData ("A sentence has words.", 1, -20, Alignment.Left, false, 1, false)] - [InlineData ("A sentence has words.", 5, -16, Alignment.Left, false, 1, false)] - [InlineData ("A sentence has words.", 20, -1, Alignment.Left, false, 1, false)] + [InlineData ("", 0, 0, Alignment.Start, false, 1, true)] + [InlineData ("", 1, 1, Alignment.Start, false, 1, true)] + [InlineData ("A sentence has words.", 0, -21, Alignment.Start, false, 1, true)] + [InlineData ("A sentence has words.", 1, -20, Alignment.Start, false, 1, false)] + [InlineData ("A sentence has words.", 5, -16, Alignment.Start, false, 1, false)] + [InlineData ("A sentence has words.", 20, -1, Alignment.Start, false, 1, false)] // no clip - [InlineData ("A sentence has words.", 21, 0, Alignment.Left, false, 1, false)] - [InlineData ("A sentence has words.", 22, 1, Alignment.Left, false, 1, false)] + [InlineData ("A sentence has words.", 21, 0, Alignment.Start, false, 1, false)] + [InlineData ("A sentence has words.", 22, 1, Alignment.Start, false, 1, false)] public void Reformat_NoWordrap_SingleLine ( string text, int maxWidth, @@ -1759,7 +1759,7 @@ ssb "\u2460\u2461\u2462\n\u2460\u2461\u2462\u2463\u2464", 8, -1, - Alignment.Left, + Alignment.Start, true, false, new [] { "\u2460\u2461\u2462", "\u2460\u2461\u2462\u2463\u2464" } @@ -1770,7 +1770,7 @@ ssb "\u2460\u2461\u2462\n\u2460\u2461\u2462\u2463\u2464", 9, 0, - Alignment.Left, + Alignment.Start, true, false, new [] { "\u2460\u2461\u2462", "\u2460\u2461\u2462\u2463\u2464" } @@ -1779,7 +1779,7 @@ ssb "\u2460\u2461\u2462\n\u2460\u2461\u2462\u2463\u2464", 10, 1, - Alignment.Left, + Alignment.Start, true, false, new [] { "\u2460\u2461\u2462", "\u2460\u2461\u2462\u2463\u2464" } @@ -1805,20 +1805,20 @@ ssb // Unicode // Even # of chars // 0123456789 - [InlineData ("\u2660пÑРвРÑ", 10, -1, Alignment.Left, true, false, new [] { "\u2660пÑРвÐ", "Ñ" })] + [InlineData ("\u2660пÑРвРÑ", 10, -1, Alignment.Start, true, false, new [] { "\u2660пÑРвÐ", "Ñ" })] // no clip - [InlineData ("\u2660пÑРвРÑ", 11, 0, Alignment.Left, true, false, new [] { "\u2660пÑРвРÑ" })] - [InlineData ("\u2660пÑРвРÑ", 12, 1, Alignment.Left, true, false, new [] { "\u2660пÑРвРÑ" })] + [InlineData ("\u2660пÑРвРÑ", 11, 0, Alignment.Start, true, false, new [] { "\u2660пÑРвРÑ" })] + [InlineData ("\u2660пÑРвРÑ", 12, 1, Alignment.Start, true, false, new [] { "\u2660пÑРвРÑ" })] // Unicode // Odd # of chars // 0123456789 - [InlineData ("\u2660 ÑРвРÑ", 9, -1, Alignment.Left, true, false, new [] { "\u2660 ÑРвÐ", "Ñ" })] + [InlineData ("\u2660 ÑРвРÑ", 9, -1, Alignment.Start, true, false, new [] { "\u2660 ÑРвÐ", "Ñ" })] // no clip - [InlineData ("\u2660 ÑРвРÑ", 10, 0, Alignment.Left, true, false, new [] { "\u2660 ÑРвРÑ" })] - [InlineData ("\u2660 ÑРвРÑ", 11, 1, Alignment.Left, true, false, new [] { "\u2660 ÑРвРÑ" })] + [InlineData ("\u2660 ÑРвРÑ", 10, 0, Alignment.Start, true, false, new [] { "\u2660 ÑРвРÑ" })] + [InlineData ("\u2660 ÑРвРÑ", 11, 1, Alignment.Start, true, false, new [] { "\u2660 ÑРвРÑ" })] public void Reformat_Unicode_Wrap_Spaces_No_NewLines ( string text, int maxWidth, @@ -1839,32 +1839,32 @@ ssb // Even # of spaces // 0123456789 - [InlineData ("012 456 89", 0, -10, Alignment.Left, true, true, true, new [] { "" })] + [InlineData ("012 456 89", 0, -10, Alignment.Start, true, true, true, new [] { "" })] [InlineData ( "012 456 89", 1, -9, - Alignment.Left, + Alignment.Start, true, true, false, new [] { "0", "1", "2", " ", "4", "5", "6", " ", "8", "9" }, "01245689" )] - [InlineData ("012 456 89", 5, -5, Alignment.Left, true, true, false, new [] { "012 ", "456 ", "89" })] - [InlineData ("012 456 89", 9, -1, Alignment.Left, true, true, false, new [] { "012 456 ", "89" })] + [InlineData ("012 456 89", 5, -5, Alignment.Start, true, true, false, new [] { "012 ", "456 ", "89" })] + [InlineData ("012 456 89", 9, -1, Alignment.Start, true, true, false, new [] { "012 456 ", "89" })] // no clip - [InlineData ("012 456 89", 10, 0, Alignment.Left, true, true, false, new [] { "012 456 89" })] - [InlineData ("012 456 89", 11, 1, Alignment.Left, true, true, false, new [] { "012 456 89" })] + [InlineData ("012 456 89", 10, 0, Alignment.Start, true, true, false, new [] { "012 456 89" })] + [InlineData ("012 456 89", 11, 1, Alignment.Start, true, true, false, new [] { "012 456 89" })] // Odd # of spaces // 01234567890123 - [InlineData ("012 456 89 end", 13, -1, Alignment.Left, true, true, false, new [] { "012 456 89 ", "end" })] + [InlineData ("012 456 89 end", 13, -1, Alignment.Start, true, true, false, new [] { "012 456 89 ", "end" })] // no clip - [InlineData ("012 456 89 end", 14, 0, Alignment.Left, true, true, false, new [] { "012 456 89 end" })] - [InlineData ("012 456 89 end", 15, 1, Alignment.Left, true, true, false, new [] { "012 456 89 end" })] + [InlineData ("012 456 89 end", 14, 0, Alignment.Start, true, true, false, new [] { "012 456 89 end" })] + [InlineData ("012 456 89 end", 15, 1, Alignment.Start, true, true, false, new [] { "012 456 89 end" })] public void Reformat_Wrap_Spaces_No_NewLines ( string text, int maxWidth, @@ -1909,7 +1909,7 @@ ssb ); } - list = TextFormatter.Format (text, maxWidth, Alignment.Left, wrap); + list = TextFormatter.Format (text, maxWidth, Alignment.Start, wrap); if (maxWidth == 1) { @@ -3159,7 +3159,7 @@ ssb TextFormatter tf = new () { Text = text, - Alignment = Alignment.Left, + Alignment = Alignment.Start, AutoSize = autoSize, }; @@ -3196,7 +3196,7 @@ ssb TextFormatter tf = new () { Text = text, - Alignment = Alignment.Right, + Alignment = Alignment.End, AutoSize = autoSize, }; @@ -3239,7 +3239,7 @@ ssb TextFormatter tf = new () { Text = text, - Alignment = Alignment.Centered, + Alignment = Alignment.Center, AutoSize = autoSize, }; @@ -3282,7 +3282,7 @@ ssb TextFormatter tf = new () { Text = text, - Alignment = Alignment.Justified, + Alignment = Alignment.Fill, AutoSize = autoSize, }; @@ -3372,7 +3372,7 @@ Nice Work")] TextFormatter tf = new () { Text = text, - Alignment = Alignment.Justified, + Alignment = Alignment.Fill, Size = new Size (width, height), MultiLine = true }; @@ -3424,7 +3424,7 @@ ek")] { Text = text, Direction = TextDirection.TopBottom_LeftRight, - VerticalAlignment = Alignment.Justified, + VerticalAlignment = Alignment.Fill, Size = new Size (width, height), MultiLine = true }; @@ -3480,9 +3480,9 @@ ek")] TextFormatter tf = new () { Text = text, - Alignment = Alignment.Right, + Alignment = Alignment.End, Direction = TextDirection.TopBottom_LeftRight, - VerticalAlignment = Alignment.Bottom, + VerticalAlignment = Alignment.End, AutoSize = autoSize, }; @@ -3622,7 +3622,7 @@ B")] { Text = text, Direction = TextDirection.TopBottom_LeftRight, - VerticalAlignment = Alignment.Centered, + VerticalAlignment = Alignment.Center, AutoSize = autoSize, }; @@ -3878,9 +3878,9 @@ B")] [SetupFakeDriver] [Theory] - // Horizontal with alignment.Top + // Horizontal with Alignment.Start // LeftRight_TopBottom - [InlineData ("0 2 4", Alignment.Left, Alignment.Top, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Start, TextDirection.LeftRight_TopBottom, @" 0 2 4** ******* ******* @@ -3888,7 +3888,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Top, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Start, TextDirection.LeftRight_TopBottom, @" **0 2 4 ******* ******* @@ -3896,7 +3896,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Top, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Start, TextDirection.LeftRight_TopBottom, @" *0 2 4* ******* ******* @@ -3904,7 +3904,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Top, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Start, TextDirection.LeftRight_TopBottom, @" 0 2 4 ******* ******* @@ -3913,7 +3913,7 @@ B")] ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Top, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Start, TextDirection.LeftRight_TopBottom, @" 0 你 4* ******* ******* @@ -3921,7 +3921,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Top, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Start, TextDirection.LeftRight_TopBottom, @" *0 你 4 ******* ******* @@ -3929,7 +3929,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Top, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Start, TextDirection.LeftRight_TopBottom, @" 0 你 4* ******* ******* @@ -3937,7 +3937,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Top, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Start, TextDirection.LeftRight_TopBottom, @" 0 你 4 ******* ******* @@ -3947,7 +3947,7 @@ B")] *******")] // LeftRight_BottomTop - [InlineData ("0 2 4", Alignment.Left, Alignment.Top, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Start, TextDirection.LeftRight_BottomTop, @" 0 2 4** ******* ******* @@ -3955,7 +3955,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Top, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Start, TextDirection.LeftRight_BottomTop, @" **0 2 4 ******* ******* @@ -3963,7 +3963,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Top, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Start, TextDirection.LeftRight_BottomTop, @" *0 2 4* ******* ******* @@ -3971,7 +3971,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Top, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Start, TextDirection.LeftRight_BottomTop, @" 0 2 4 ******* ******* @@ -3980,7 +3980,7 @@ B")] ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Top, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Start, TextDirection.LeftRight_BottomTop, @" 0 你 4* ******* ******* @@ -3988,7 +3988,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Top, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Start, TextDirection.LeftRight_BottomTop, @" *0 你 4 ******* ******* @@ -3996,7 +3996,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Top, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Start, TextDirection.LeftRight_BottomTop, @" 0 你 4* ******* ******* @@ -4004,7 +4004,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Top, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Start, TextDirection.LeftRight_BottomTop, @" 0 你 4 ******* ******* @@ -4014,7 +4014,7 @@ B")] *******")] // RightLeft_TopBottom - [InlineData ("0 2 4", Alignment.Left, Alignment.Top, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Start, TextDirection.RightLeft_TopBottom, @" 4 2 0** ******* ******* @@ -4022,7 +4022,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Top, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Start, TextDirection.RightLeft_TopBottom, @" **4 2 0 ******* ******* @@ -4030,7 +4030,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Top, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Start, TextDirection.RightLeft_TopBottom, @" *4 2 0* ******* ******* @@ -4038,7 +4038,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Top, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Start, TextDirection.RightLeft_TopBottom, @" 4 2 0 ******* ******* @@ -4047,7 +4047,7 @@ B")] ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Top, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Start, TextDirection.RightLeft_TopBottom, @" 4 你 0* ******* ******* @@ -4055,7 +4055,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Top, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Start, TextDirection.RightLeft_TopBottom, @" *4 你 0 ******* ******* @@ -4063,7 +4063,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Top, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Start, TextDirection.RightLeft_TopBottom, @" 4 你 0* ******* ******* @@ -4071,7 +4071,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Top, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Start, TextDirection.RightLeft_TopBottom, @" 4 你 0 ******* ******* @@ -4081,7 +4081,7 @@ B")] *******")] // RightLeft_BottomTop - [InlineData ("0 2 4", Alignment.Left, Alignment.Top, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Start, TextDirection.RightLeft_BottomTop, @" 4 2 0** ******* ******* @@ -4089,7 +4089,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Top, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Start, TextDirection.RightLeft_BottomTop, @" **4 2 0 ******* ******* @@ -4097,7 +4097,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Top, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Start, TextDirection.RightLeft_BottomTop, @" *4 2 0* ******* ******* @@ -4105,7 +4105,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Top, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Start, TextDirection.RightLeft_BottomTop, @" 4 2 0 ******* ******* @@ -4114,7 +4114,7 @@ B")] ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Top, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Start, TextDirection.RightLeft_BottomTop, @" 4 你 0* ******* ******* @@ -4122,7 +4122,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Top, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Start, TextDirection.RightLeft_BottomTop, @" *4 你 0 ******* ******* @@ -4130,7 +4130,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Top, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Start, TextDirection.RightLeft_BottomTop, @" 4 你 0* ******* ******* @@ -4138,7 +4138,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Top, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Start, TextDirection.RightLeft_BottomTop, @" 4 你 0 ******* ******* @@ -4147,9 +4147,9 @@ B")] ******* *******")] - // Horizontal with alignment.Bottom + // Horizontal with Alignment.End // LeftRight_TopBottom - [InlineData ("0 2 4", Alignment.Left, Alignment.Bottom, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.End, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4157,7 +4157,7 @@ B")] ******* ******* 0 2 4**")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Bottom, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.End, Alignment.End, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4165,7 +4165,7 @@ B")] ******* ******* **0 2 4")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Bottom, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.End, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4173,7 +4173,7 @@ B")] ******* ******* *0 2 4*")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Bottom, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.End, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4182,7 +4182,7 @@ B")] ******* 0 2 4")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Bottom, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.End, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4190,7 +4190,7 @@ B")] ******* ******* 0 你 4*")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Bottom, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.End, Alignment.End, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4198,7 +4198,7 @@ B")] ******* ******* *0 你 4")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Bottom, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.End, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4206,7 +4206,7 @@ B")] ******* ******* 0 你 4*")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Bottom, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.End, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4216,7 +4216,7 @@ B")] 0 你 4")] // LeftRight_BottomTop - [InlineData ("0 2 4", Alignment.Left, Alignment.Bottom, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.End, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4224,7 +4224,7 @@ B")] ******* ******* 0 2 4**")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Bottom, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.End, Alignment.End, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4232,7 +4232,7 @@ B")] ******* ******* **0 2 4")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Bottom, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.End, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4240,7 +4240,7 @@ B")] ******* ******* *0 2 4*")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Bottom, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.End, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4249,7 +4249,7 @@ B")] ******* 0 2 4")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Bottom, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.End, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4257,7 +4257,7 @@ B")] ******* ******* 0 你 4*")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Bottom, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.End, Alignment.End, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4265,7 +4265,7 @@ B")] ******* ******* *0 你 4")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Bottom, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.End, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4273,7 +4273,7 @@ B")] ******* ******* 0 你 4*")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Bottom, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.End, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4283,7 +4283,7 @@ B")] 0 你 4")] // RightLeft_TopBottom - [InlineData ("0 2 4", Alignment.Left, Alignment.Bottom, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.End, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4291,7 +4291,7 @@ B")] ******* ******* 4 2 0**")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Bottom, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.End, Alignment.End, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4299,7 +4299,7 @@ B")] ******* ******* **4 2 0")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Bottom, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.End, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4307,7 +4307,7 @@ B")] ******* ******* *4 2 0*")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Bottom, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.End, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4316,7 +4316,7 @@ B")] ******* 4 2 0")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Bottom, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.End, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4324,7 +4324,7 @@ B")] ******* ******* 4 你 0*")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Bottom, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.End, Alignment.End, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4332,7 +4332,7 @@ B")] ******* ******* *4 你 0")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Bottom, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.End, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4340,7 +4340,7 @@ B")] ******* ******* 4 你 0*")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Bottom, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.End, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4350,7 +4350,7 @@ B")] 4 你 0")] // RightLeft_BottomTop - [InlineData ("0 2 4", Alignment.Left, Alignment.Bottom, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.End, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4358,7 +4358,7 @@ B")] ******* ******* 4 2 0**")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Bottom, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.End, Alignment.End, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4366,7 +4366,7 @@ B")] ******* ******* **4 2 0")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Bottom, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.End, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4374,7 +4374,7 @@ B")] ******* ******* *4 2 0*")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Bottom, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.End, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4383,7 +4383,7 @@ B")] ******* 4 2 0")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Bottom, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.End, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4391,7 +4391,7 @@ B")] ******* ******* 4 你 0*")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Bottom, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.End, Alignment.End, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4399,7 +4399,7 @@ B")] ******* ******* *4 你 0")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Bottom, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.End, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4407,7 +4407,7 @@ B")] ******* ******* 4 你 0*")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Bottom, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.End, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4418,7 +4418,7 @@ B")] // Horizontal with alignment.Centered // LeftRight_TopBottom - [InlineData ("0 2 4", Alignment.Left, Alignment.Centered, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Center, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4426,7 +4426,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Centered, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Center, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4434,7 +4434,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Centered, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Center, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4442,7 +4442,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Centered, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Center, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4451,7 +4451,7 @@ B")] ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Centered, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Center, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4459,7 +4459,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Centered, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Center, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4467,7 +4467,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Centered, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Center, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4475,7 +4475,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Centered, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Center, TextDirection.LeftRight_TopBottom, @" ******* ******* ******* @@ -4485,7 +4485,7 @@ B")] *******")] // LeftRight_BottomTop - [InlineData ("0 2 4", Alignment.Left, Alignment.Centered, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Center, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4493,7 +4493,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Centered, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Center, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4501,7 +4501,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Centered, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Center, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4509,7 +4509,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Centered, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Center, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4518,7 +4518,7 @@ B")] ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Centered, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Center, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4526,7 +4526,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Centered, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Center, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4534,7 +4534,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Centered, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Center, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4542,7 +4542,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Centered, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Center, TextDirection.LeftRight_BottomTop, @" ******* ******* ******* @@ -4552,7 +4552,7 @@ B")] *******")] // RightLeft_TopBottom - [InlineData ("0 2 4", Alignment.Left, Alignment.Centered, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Center, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4560,7 +4560,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Centered, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Center, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4568,7 +4568,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Centered, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Center, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4576,7 +4576,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Centered, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Center, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4585,7 +4585,7 @@ B")] ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Centered, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Center, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4593,7 +4593,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Centered, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Center, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4601,7 +4601,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Centered, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Center, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4609,7 +4609,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Centered, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Center, TextDirection.RightLeft_TopBottom, @" ******* ******* ******* @@ -4619,7 +4619,7 @@ B")] *******")] // RightLeft_BottomTop - [InlineData ("0 2 4", Alignment.Left, Alignment.Centered, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Center, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4627,7 +4627,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Centered, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Center, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4635,7 +4635,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Centered, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Center, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4643,7 +4643,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Centered, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Center, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4652,7 +4652,7 @@ B")] ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Centered, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Center, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4660,7 +4660,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Centered, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Center, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4668,7 +4668,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Centered, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Center, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4676,7 +4676,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Centered, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Center, TextDirection.RightLeft_BottomTop, @" ******* ******* ******* @@ -4687,7 +4687,7 @@ B")] // Horizontal with alignment.Justified // LeftRight_TopBottom - [InlineData ("0 2 4", Alignment.Left, Alignment.Justified, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Fill, TextDirection.LeftRight_TopBottom, @" 0 2 4** ******* ******* @@ -4695,7 +4695,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Justified, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Fill, TextDirection.LeftRight_TopBottom, @" **0 2 4 ******* ******* @@ -4703,7 +4703,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Justified, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Fill, TextDirection.LeftRight_TopBottom, @" *0 2 4* ******* ******* @@ -4711,7 +4711,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Justified, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Fill, TextDirection.LeftRight_TopBottom, @" 0 2 4 ******* ******* @@ -4720,7 +4720,7 @@ B")] ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Justified, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Fill, TextDirection.LeftRight_TopBottom, @" 0 你 4* ******* ******* @@ -4728,7 +4728,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Justified, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Fill, TextDirection.LeftRight_TopBottom, @" *0 你 4 ******* ******* @@ -4736,7 +4736,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Justified, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Fill, TextDirection.LeftRight_TopBottom, @" 0 你 4* ******* ******* @@ -4744,7 +4744,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Justified, TextDirection.LeftRight_TopBottom, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Fill, TextDirection.LeftRight_TopBottom, @" 0 你 4 ******* ******* @@ -4754,7 +4754,7 @@ B")] *******")] // LeftRight_BottomTop - [InlineData ("0 2 4", Alignment.Left, Alignment.Justified, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Fill, TextDirection.LeftRight_BottomTop, @" 0 2 4** ******* ******* @@ -4762,7 +4762,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Justified, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Fill, TextDirection.LeftRight_BottomTop, @" **0 2 4 ******* ******* @@ -4770,7 +4770,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Justified, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Fill, TextDirection.LeftRight_BottomTop, @" *0 2 4* ******* ******* @@ -4778,7 +4778,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Justified, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Fill, TextDirection.LeftRight_BottomTop, @" 0 2 4 ******* ******* @@ -4787,7 +4787,7 @@ B")] ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Justified, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Fill, TextDirection.LeftRight_BottomTop, @" 0 你 4* ******* ******* @@ -4795,7 +4795,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Justified, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Fill, TextDirection.LeftRight_BottomTop, @" *0 你 4 ******* ******* @@ -4803,7 +4803,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Justified, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Fill, TextDirection.LeftRight_BottomTop, @" 0 你 4* ******* ******* @@ -4811,7 +4811,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Justified, TextDirection.LeftRight_BottomTop, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Fill, TextDirection.LeftRight_BottomTop, @" 0 你 4 ******* ******* @@ -4821,7 +4821,7 @@ B")] *******")] // RightLeft_TopBottom - [InlineData ("0 2 4", Alignment.Left, Alignment.Justified, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Fill, TextDirection.RightLeft_TopBottom, @" 4 2 0** ******* ******* @@ -4829,7 +4829,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Justified, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Fill, TextDirection.RightLeft_TopBottom, @" **4 2 0 ******* ******* @@ -4837,7 +4837,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Justified, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Fill, TextDirection.RightLeft_TopBottom, @" *4 2 0* ******* ******* @@ -4845,7 +4845,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Justified, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Fill, TextDirection.RightLeft_TopBottom, @" 4 2 0 ******* ******* @@ -4854,7 +4854,7 @@ B")] ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Justified, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Fill, TextDirection.RightLeft_TopBottom, @" 4 你 0* ******* ******* @@ -4862,7 +4862,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Justified, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Fill, TextDirection.RightLeft_TopBottom, @" *4 你 0 ******* ******* @@ -4870,7 +4870,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Justified, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Fill, TextDirection.RightLeft_TopBottom, @" 4 你 0* ******* ******* @@ -4878,7 +4878,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Justified, TextDirection.RightLeft_TopBottom, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Fill, TextDirection.RightLeft_TopBottom, @" 4 你 0 ******* ******* @@ -4888,7 +4888,7 @@ B")] *******")] // RightLeft_BottomTop - [InlineData ("0 2 4", Alignment.Left, Alignment.Justified, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Fill, TextDirection.RightLeft_BottomTop, @" 4 2 0** ******* ******* @@ -4896,7 +4896,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Justified, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Fill, TextDirection.RightLeft_BottomTop, @" **4 2 0 ******* ******* @@ -4904,7 +4904,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Justified, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Fill, TextDirection.RightLeft_BottomTop, @" *4 2 0* ******* ******* @@ -4912,7 +4912,7 @@ B")] ******* ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Justified, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Fill, TextDirection.RightLeft_BottomTop, @" 4 2 0 ******* ******* @@ -4921,7 +4921,7 @@ B")] ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Justified, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Fill, TextDirection.RightLeft_BottomTop, @" 4 你 0* ******* ******* @@ -4929,7 +4929,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Justified, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Fill, TextDirection.RightLeft_BottomTop, @" *4 你 0 ******* ******* @@ -4937,7 +4937,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Justified, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Fill, TextDirection.RightLeft_BottomTop, @" 4 你 0* ******* ******* @@ -4945,7 +4945,7 @@ B")] ******* ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Justified, TextDirection.RightLeft_BottomTop, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Fill, TextDirection.RightLeft_BottomTop, @" 4 你 0 ******* ******* @@ -4956,7 +4956,7 @@ B")] // Vertical with alignment.Left // TopBottom_LeftRight - [InlineData ("0 2 4", Alignment.Left, Alignment.Top, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Start, TextDirection.TopBottom_LeftRight, @" 0****** ****** 2****** @@ -4964,7 +4964,7 @@ B")] 4****** ******* *******")] - [InlineData ("0 2 4", Alignment.Left, Alignment.Bottom, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.End, TextDirection.TopBottom_LeftRight, @" ******* ******* 0****** @@ -4972,7 +4972,7 @@ B")] 2****** ****** 4******")] - [InlineData ("0 2 4", Alignment.Left, Alignment.Centered, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Center, TextDirection.TopBottom_LeftRight, @" ******* 0****** ****** @@ -4980,7 +4980,7 @@ B")] ****** 4****** *******")] - [InlineData ("0 2 4", Alignment.Left, Alignment.Justified, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Fill, TextDirection.TopBottom_LeftRight, @" 0****** ****** ****** @@ -4989,7 +4989,7 @@ B")] ****** 4******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Top, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Start, TextDirection.TopBottom_LeftRight, @" 0****** ****** 你***** @@ -4997,7 +4997,7 @@ B")] 4****** ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Bottom, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.End, TextDirection.TopBottom_LeftRight, @" ******* ******* 0****** @@ -5005,7 +5005,7 @@ B")] 你***** ****** 4******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Centered, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Center, TextDirection.TopBottom_LeftRight, @" ******* 0****** ****** @@ -5013,7 +5013,7 @@ B")] ****** 4****** *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Justified, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Fill, TextDirection.TopBottom_LeftRight, @" 0****** ****** ****** @@ -5023,7 +5023,7 @@ B")] 4******")] // TopBottom_RightLeft - [InlineData ("0 2 4", Alignment.Left, Alignment.Top, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Start, TextDirection.TopBottom_RightLeft, @" 0****** ****** 2****** @@ -5031,7 +5031,7 @@ B")] 4****** ******* *******")] - [InlineData ("0 2 4", Alignment.Left, Alignment.Bottom, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.End, TextDirection.TopBottom_RightLeft, @" ******* ******* 0****** @@ -5039,7 +5039,7 @@ B")] 2****** ****** 4******")] - [InlineData ("0 2 4", Alignment.Left, Alignment.Centered, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Center, TextDirection.TopBottom_RightLeft, @" ******* 0****** ****** @@ -5047,7 +5047,7 @@ B")] ****** 4****** *******")] - [InlineData ("0 2 4", Alignment.Left, Alignment.Justified, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Fill, TextDirection.TopBottom_RightLeft, @" 0****** ****** ****** @@ -5056,7 +5056,7 @@ B")] ****** 4******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Top, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Start, TextDirection.TopBottom_RightLeft, @" 0****** ****** 你***** @@ -5064,7 +5064,7 @@ B")] 4****** ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Bottom, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.End, TextDirection.TopBottom_RightLeft, @" ******* ******* 0****** @@ -5072,7 +5072,7 @@ B")] 你***** ****** 4******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Centered, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Center, TextDirection.TopBottom_RightLeft, @" ******* 0****** ****** @@ -5080,7 +5080,7 @@ B")] ****** 4****** *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Justified, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Fill, TextDirection.TopBottom_RightLeft, @" 0****** ****** ****** @@ -5090,7 +5090,7 @@ B")] 4******")] // BottomTop_LeftRight - [InlineData ("0 2 4", Alignment.Left, Alignment.Top, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Start, TextDirection.BottomTop_LeftRight, @" 4****** ****** 2****** @@ -5098,7 +5098,7 @@ B")] 0****** ******* *******")] - [InlineData ("0 2 4", Alignment.Left, Alignment.Bottom, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.End, TextDirection.BottomTop_LeftRight, @" ******* ******* 4****** @@ -5106,7 +5106,7 @@ B")] 2****** ****** 0******")] - [InlineData ("0 2 4", Alignment.Left, Alignment.Centered, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Center, TextDirection.BottomTop_LeftRight, @" ******* 4****** ****** @@ -5114,7 +5114,7 @@ B")] ****** 0****** *******")] - [InlineData ("0 2 4", Alignment.Left, Alignment.Justified, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Fill, TextDirection.BottomTop_LeftRight, @" 4****** ****** ****** @@ -5123,7 +5123,7 @@ B")] ****** 0******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Top, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Start, TextDirection.BottomTop_LeftRight, @" 4****** ****** 你***** @@ -5131,7 +5131,7 @@ B")] 0****** ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Bottom, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.End, TextDirection.BottomTop_LeftRight, @" ******* ******* 4****** @@ -5139,7 +5139,7 @@ B")] 你***** ****** 0******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Centered, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Center, TextDirection.BottomTop_LeftRight, @" ******* 4****** ****** @@ -5147,7 +5147,7 @@ B")] ****** 0****** *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Justified, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Fill, TextDirection.BottomTop_LeftRight, @" 4****** ****** ****** @@ -5157,7 +5157,7 @@ B")] 0******")] // BottomTop_RightLeft - [InlineData ("0 2 4", Alignment.Left, Alignment.Top, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Start, TextDirection.BottomTop_RightLeft, @" 4****** ****** 2****** @@ -5165,7 +5165,7 @@ B")] 0****** ******* *******")] - [InlineData ("0 2 4", Alignment.Left, Alignment.Bottom, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.End, TextDirection.BottomTop_RightLeft, @" ******* ******* 4****** @@ -5173,7 +5173,7 @@ B")] 2****** ****** 0******")] - [InlineData ("0 2 4", Alignment.Left, Alignment.Centered, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Center, TextDirection.BottomTop_RightLeft, @" ******* 4****** ****** @@ -5181,7 +5181,7 @@ B")] ****** 0****** *******")] - [InlineData ("0 2 4", Alignment.Left, Alignment.Justified, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.Start, Alignment.Fill, TextDirection.BottomTop_RightLeft, @" 4****** ****** ****** @@ -5190,7 +5190,7 @@ B")] ****** 0******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Top, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Start, TextDirection.BottomTop_RightLeft, @" 4****** ****** 你***** @@ -5198,7 +5198,7 @@ B")] 0****** ******* *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Bottom, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.End, TextDirection.BottomTop_RightLeft, @" ******* ******* 4****** @@ -5206,7 +5206,7 @@ B")] 你***** ****** 0******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Centered, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Center, TextDirection.BottomTop_RightLeft, @" ******* 4****** ****** @@ -5214,7 +5214,7 @@ B")] ****** 0****** *******")] - [InlineData ("0 你 4", Alignment.Left, Alignment.Justified, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.Start, Alignment.Fill, TextDirection.BottomTop_RightLeft, @" 4****** ****** ****** @@ -5225,7 +5225,7 @@ B")] // Vertical with alignment.Right // TopBottom_LeftRight - [InlineData ("0 2 4", Alignment.Right, Alignment.Top, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Start, TextDirection.TopBottom_LeftRight, @" ******0 ****** ******2 @@ -5233,7 +5233,7 @@ B")] ******4 ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Bottom, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.End, Alignment.End, TextDirection.TopBottom_LeftRight, @" ******* ******* ******0 @@ -5241,7 +5241,7 @@ B")] ******2 ****** ******4")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Centered, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Center, TextDirection.TopBottom_LeftRight, @" ******* ******0 ****** @@ -5249,7 +5249,7 @@ B")] ****** ******4 *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Justified, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Fill, TextDirection.TopBottom_LeftRight, @" ******0 ****** ****** @@ -5258,7 +5258,7 @@ B")] ****** ******4")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Top, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Start, TextDirection.TopBottom_LeftRight, @" *****0* ***** * *****你 @@ -5266,7 +5266,7 @@ B")] *****4* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Bottom, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.End, Alignment.End, TextDirection.TopBottom_LeftRight, @" ******* ******* *****0* @@ -5274,7 +5274,7 @@ B")] *****你 ***** * *****4*")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Centered, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Center, TextDirection.TopBottom_LeftRight, @" ******* *****0* ***** * @@ -5282,7 +5282,7 @@ B")] ***** * *****4* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Justified, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Fill, TextDirection.TopBottom_LeftRight, @" *****0* ***** * ***** * @@ -5292,7 +5292,7 @@ B")] *****4*")] // TopBottom_RightLeft - [InlineData ("0 2 4", Alignment.Right, Alignment.Top, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Start, TextDirection.TopBottom_RightLeft, @" ******0 ****** ******2 @@ -5300,7 +5300,7 @@ B")] ******4 ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Bottom, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.End, Alignment.End, TextDirection.TopBottom_RightLeft, @" ******* ******* ******0 @@ -5308,7 +5308,7 @@ B")] ******2 ****** ******4")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Centered, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Center, TextDirection.TopBottom_RightLeft, @" ******* ******0 ****** @@ -5316,7 +5316,7 @@ B")] ****** ******4 *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Justified, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Fill, TextDirection.TopBottom_RightLeft, @" ******0 ****** ****** @@ -5325,7 +5325,7 @@ B")] ****** ******4")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Top, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Start, TextDirection.TopBottom_RightLeft, @" *****0* ***** * *****你 @@ -5333,7 +5333,7 @@ B")] *****4* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Bottom, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.End, Alignment.End, TextDirection.TopBottom_RightLeft, @" ******* ******* *****0* @@ -5341,7 +5341,7 @@ B")] *****你 ***** * *****4*")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Centered, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Center, TextDirection.TopBottom_RightLeft, @" ******* *****0* ***** * @@ -5349,7 +5349,7 @@ B")] ***** * *****4* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Justified, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Fill, TextDirection.TopBottom_RightLeft, @" *****0* ***** * ***** * @@ -5359,7 +5359,7 @@ B")] *****4*")] // BottomTop_LeftRight - [InlineData ("0 2 4", Alignment.Right, Alignment.Top, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Start, TextDirection.BottomTop_LeftRight, @" ******4 ****** ******2 @@ -5367,7 +5367,7 @@ B")] ******0 ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Bottom, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.End, Alignment.End, TextDirection.BottomTop_LeftRight, @" ******* ******* ******4 @@ -5375,7 +5375,7 @@ B")] ******2 ****** ******0")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Centered, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Center, TextDirection.BottomTop_LeftRight, @" ******* ******4 ****** @@ -5383,7 +5383,7 @@ B")] ****** ******0 *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Justified, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Fill, TextDirection.BottomTop_LeftRight, @" ******4 ****** ****** @@ -5392,7 +5392,7 @@ B")] ****** ******0")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Top, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Start, TextDirection.BottomTop_LeftRight, @" *****4* ***** * *****你 @@ -5400,7 +5400,7 @@ B")] *****0* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Bottom, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.End, Alignment.End, TextDirection.BottomTop_LeftRight, @" ******* ******* *****4* @@ -5408,7 +5408,7 @@ B")] *****你 ***** * *****0*")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Centered, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Center, TextDirection.BottomTop_LeftRight, @" ******* *****4* ***** * @@ -5416,7 +5416,7 @@ B")] ***** * *****0* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Justified, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Fill, TextDirection.BottomTop_LeftRight, @" *****4* ***** * ***** * @@ -5426,7 +5426,7 @@ B")] *****0*")] // BottomTop_RightLeft - [InlineData ("0 2 4", Alignment.Right, Alignment.Top, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Start, TextDirection.BottomTop_RightLeft, @" ******4 ****** ******2 @@ -5434,7 +5434,7 @@ B")] ******0 ******* *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Bottom, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.End, Alignment.End, TextDirection.BottomTop_RightLeft, @" ******* ******* ******4 @@ -5442,7 +5442,7 @@ B")] ******2 ****** ******0")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Centered, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Center, TextDirection.BottomTop_RightLeft, @" ******* ******4 ****** @@ -5450,7 +5450,7 @@ B")] ****** ******0 *******")] - [InlineData ("0 2 4", Alignment.Right, Alignment.Justified, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.End, Alignment.Fill, TextDirection.BottomTop_RightLeft, @" ******4 ****** ****** @@ -5459,7 +5459,7 @@ B")] ****** ******0")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Top, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Start, TextDirection.BottomTop_RightLeft, @" *****4* ***** * *****你 @@ -5467,7 +5467,7 @@ B")] *****0* ******* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Bottom, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.End, Alignment.End, TextDirection.BottomTop_RightLeft, @" ******* ******* *****4* @@ -5475,7 +5475,7 @@ B")] *****你 ***** * *****0*")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Centered, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Center, TextDirection.BottomTop_RightLeft, @" ******* *****4* ***** * @@ -5483,7 +5483,7 @@ B")] ***** * *****0* *******")] - [InlineData ("0 你 4", Alignment.Right, Alignment.Justified, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.End, Alignment.Fill, TextDirection.BottomTop_RightLeft, @" *****4* ***** * ***** * @@ -5494,7 +5494,7 @@ B")] // Vertical with alignment.Centered // TopBottom_LeftRight - [InlineData ("0 2 4", Alignment.Centered, Alignment.Top, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Start, TextDirection.TopBottom_LeftRight, @" ***0*** *** *** ***2*** @@ -5502,7 +5502,7 @@ B")] ***4*** ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Bottom, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.End, TextDirection.TopBottom_LeftRight, @" ******* ******* ***0*** @@ -5510,7 +5510,7 @@ B")] ***2*** *** *** ***4***")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Centered, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Center, TextDirection.TopBottom_LeftRight, @" ******* ***0*** *** *** @@ -5518,7 +5518,7 @@ B")] *** *** ***4*** *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Justified, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Fill, TextDirection.TopBottom_LeftRight, @" ***0*** *** *** *** *** @@ -5527,7 +5527,7 @@ B")] *** *** ***4***")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Top, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Start, TextDirection.TopBottom_LeftRight, @" **0**** ** **** **你*** @@ -5535,7 +5535,7 @@ B")] **4**** ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Bottom, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.End, TextDirection.TopBottom_LeftRight, @" ******* ******* **0**** @@ -5543,7 +5543,7 @@ B")] **你*** ** **** **4****")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Centered, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Center, TextDirection.TopBottom_LeftRight, @" ******* **0**** ** **** @@ -5551,7 +5551,7 @@ B")] ** **** **4**** *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Justified, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Fill, TextDirection.TopBottom_LeftRight, @" **0**** ** **** ** **** @@ -5561,7 +5561,7 @@ B")] **4****")] // TopBottom_RightLeft - [InlineData ("0 2 4", Alignment.Centered, Alignment.Top, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Start, TextDirection.TopBottom_RightLeft, @" ***0*** *** *** ***2*** @@ -5569,7 +5569,7 @@ B")] ***4*** ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Bottom, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.End, TextDirection.TopBottom_RightLeft, @" ******* ******* ***0*** @@ -5577,7 +5577,7 @@ B")] ***2*** *** *** ***4***")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Centered, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Center, TextDirection.TopBottom_RightLeft, @" ******* ***0*** *** *** @@ -5585,7 +5585,7 @@ B")] *** *** ***4*** *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Justified, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Fill, TextDirection.TopBottom_RightLeft, @" ***0*** *** *** *** *** @@ -5594,7 +5594,7 @@ B")] *** *** ***4***")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Top, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Start, TextDirection.TopBottom_RightLeft, @" **0**** ** **** **你*** @@ -5602,7 +5602,7 @@ B")] **4**** ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Bottom, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.End, TextDirection.TopBottom_RightLeft, @" ******* ******* **0**** @@ -5610,7 +5610,7 @@ B")] **你*** ** **** **4****")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Centered, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Center, TextDirection.TopBottom_RightLeft, @" ******* **0**** ** **** @@ -5618,7 +5618,7 @@ B")] ** **** **4**** *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Justified, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Fill, TextDirection.TopBottom_RightLeft, @" **0**** ** **** ** **** @@ -5628,7 +5628,7 @@ B")] **4****")] // BottomTop_LeftRight - [InlineData ("0 2 4", Alignment.Centered, Alignment.Top, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Start, TextDirection.BottomTop_LeftRight, @" ***4*** *** *** ***2*** @@ -5636,7 +5636,7 @@ B")] ***0*** ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Bottom, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.End, TextDirection.BottomTop_LeftRight, @" ******* ******* ***4*** @@ -5644,7 +5644,7 @@ B")] ***2*** *** *** ***0***")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Centered, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Center, TextDirection.BottomTop_LeftRight, @" ******* ***4*** *** *** @@ -5652,7 +5652,7 @@ B")] *** *** ***0*** *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Justified, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Fill, TextDirection.BottomTop_LeftRight, @" ***4*** *** *** *** *** @@ -5661,7 +5661,7 @@ B")] *** *** ***0***")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Top, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Start, TextDirection.BottomTop_LeftRight, @" **4**** ** **** **你*** @@ -5669,7 +5669,7 @@ B")] **0**** ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Bottom, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.End, TextDirection.BottomTop_LeftRight, @" ******* ******* **4**** @@ -5677,7 +5677,7 @@ B")] **你*** ** **** **0****")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Centered, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Center, TextDirection.BottomTop_LeftRight, @" ******* **4**** ** **** @@ -5685,7 +5685,7 @@ B")] ** **** **0**** *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Justified, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Fill, TextDirection.BottomTop_LeftRight, @" **4**** ** **** ** **** @@ -5695,7 +5695,7 @@ B")] **0****")] // BottomTop_RightLeft - [InlineData ("0 2 4", Alignment.Centered, Alignment.Top, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Start, TextDirection.BottomTop_RightLeft, @" ***4*** *** *** ***2*** @@ -5703,7 +5703,7 @@ B")] ***0*** ******* *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Bottom, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.End, TextDirection.BottomTop_RightLeft, @" ******* ******* ***4*** @@ -5711,7 +5711,7 @@ B")] ***2*** *** *** ***0***")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Centered, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Center, TextDirection.BottomTop_RightLeft, @" ******* ***4*** *** *** @@ -5719,7 +5719,7 @@ B")] *** *** ***0*** *******")] - [InlineData ("0 2 4", Alignment.Centered, Alignment.Justified, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.Center, Alignment.Fill, TextDirection.BottomTop_RightLeft, @" ***4*** *** *** *** *** @@ -5728,7 +5728,7 @@ B")] *** *** ***0***")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Top, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Start, TextDirection.BottomTop_RightLeft, @" **4**** ** **** **你*** @@ -5736,7 +5736,7 @@ B")] **0**** ******* *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Bottom, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.End, TextDirection.BottomTop_RightLeft, @" ******* ******* **4**** @@ -5744,7 +5744,7 @@ B")] **你*** ** **** **0****")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Centered, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Center, TextDirection.BottomTop_RightLeft, @" ******* **4**** ** **** @@ -5752,7 +5752,7 @@ B")] ** **** **0**** *******")] - [InlineData ("0 你 4", Alignment.Centered, Alignment.Justified, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.Center, Alignment.Fill, TextDirection.BottomTop_RightLeft, @" **4**** ** **** ** **** @@ -5763,7 +5763,7 @@ B")] // Vertical with alignment.Justified // TopBottom_LeftRight - [InlineData ("0 2 4", Alignment.Justified, Alignment.Top, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Start, TextDirection.TopBottom_LeftRight, @" 0****** ****** 2****** @@ -5771,7 +5771,7 @@ B")] 4****** ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Bottom, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.End, TextDirection.TopBottom_LeftRight, @" ******* ******* 0****** @@ -5779,7 +5779,7 @@ B")] 2****** ****** 4******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Centered, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Center, TextDirection.TopBottom_LeftRight, @" ******* 0****** ****** @@ -5787,7 +5787,7 @@ B")] ****** 4****** *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Justified, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Fill, TextDirection.TopBottom_LeftRight, @" 0****** ****** ****** @@ -5796,7 +5796,7 @@ B")] ****** 4******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Top, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Start, TextDirection.TopBottom_LeftRight, @" 0****** ****** 你***** @@ -5804,7 +5804,7 @@ B")] 4****** ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Bottom, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.End, TextDirection.TopBottom_LeftRight, @" ******* ******* 0****** @@ -5812,7 +5812,7 @@ B")] 你***** ****** 4******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Centered, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Center, TextDirection.TopBottom_LeftRight, @" ******* 0****** ****** @@ -5820,7 +5820,7 @@ B")] ****** 4****** *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Justified, TextDirection.TopBottom_LeftRight, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Fill, TextDirection.TopBottom_LeftRight, @" 0****** ****** ****** @@ -5830,7 +5830,7 @@ B")] 4******")] // TopBottom_RightLeft - [InlineData ("0 2 4", Alignment.Justified, Alignment.Top, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Start, TextDirection.TopBottom_RightLeft, @" 0****** ****** 2****** @@ -5838,7 +5838,7 @@ B")] 4****** ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Bottom, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.End, TextDirection.TopBottom_RightLeft, @" ******* ******* 0****** @@ -5846,7 +5846,7 @@ B")] 2****** ****** 4******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Centered, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Center, TextDirection.TopBottom_RightLeft, @" ******* 0****** ****** @@ -5854,7 +5854,7 @@ B")] ****** 4****** *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Justified, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Fill, TextDirection.TopBottom_RightLeft, @" 0****** ****** ****** @@ -5863,7 +5863,7 @@ B")] ****** 4******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Top, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Start, TextDirection.TopBottom_RightLeft, @" 0****** ****** 你***** @@ -5871,7 +5871,7 @@ B")] 4****** ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Bottom, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.End, TextDirection.TopBottom_RightLeft, @" ******* ******* 0****** @@ -5879,7 +5879,7 @@ B")] 你***** ****** 4******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Centered, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Center, TextDirection.TopBottom_RightLeft, @" ******* 0****** ****** @@ -5887,7 +5887,7 @@ B")] ****** 4****** *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Justified, TextDirection.TopBottom_RightLeft, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Fill, TextDirection.TopBottom_RightLeft, @" 0****** ****** ****** @@ -5897,7 +5897,7 @@ B")] 4******")] // BottomTop_LeftRight - [InlineData ("0 2 4", Alignment.Justified, Alignment.Top, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Start, TextDirection.BottomTop_LeftRight, @" 4****** ****** 2****** @@ -5905,7 +5905,7 @@ B")] 0****** ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Bottom, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.End, TextDirection.BottomTop_LeftRight, @" ******* ******* 4****** @@ -5913,7 +5913,7 @@ B")] 2****** ****** 0******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Centered, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Center, TextDirection.BottomTop_LeftRight, @" ******* 4****** ****** @@ -5921,7 +5921,7 @@ B")] ****** 0****** *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Justified, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Fill, TextDirection.BottomTop_LeftRight, @" 4****** ****** ****** @@ -5930,7 +5930,7 @@ B")] ****** 0******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Top, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Start, TextDirection.BottomTop_LeftRight, @" 4****** ****** 你***** @@ -5938,7 +5938,7 @@ B")] 0****** ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Bottom, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.End, TextDirection.BottomTop_LeftRight, @" ******* ******* 4****** @@ -5946,7 +5946,7 @@ B")] 你***** ****** 0******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Centered, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Center, TextDirection.BottomTop_LeftRight, @" ******* 4****** ****** @@ -5954,7 +5954,7 @@ B")] ****** 0****** *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Justified, TextDirection.BottomTop_LeftRight, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Fill, TextDirection.BottomTop_LeftRight, @" 4****** ****** ****** @@ -5964,7 +5964,7 @@ B")] 0******")] // BottomTop_RightLeft - [InlineData ("0 2 4", Alignment.Justified, Alignment.Top, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Start, TextDirection.BottomTop_RightLeft, @" 4****** ****** 2****** @@ -5972,7 +5972,7 @@ B")] 0****** ******* *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Bottom, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.End, TextDirection.BottomTop_RightLeft, @" ******* ******* 4****** @@ -5980,7 +5980,7 @@ B")] 2****** ****** 0******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Centered, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Center, TextDirection.BottomTop_RightLeft, @" ******* 4****** ****** @@ -5988,7 +5988,7 @@ B")] ****** 0****** *******")] - [InlineData ("0 2 4", Alignment.Justified, Alignment.Justified, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 2 4", Alignment.Fill, Alignment.Fill, TextDirection.BottomTop_RightLeft, @" 4****** ****** ****** @@ -5997,7 +5997,7 @@ B")] ****** 0******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Top, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Start, TextDirection.BottomTop_RightLeft, @" 4****** ****** 你***** @@ -6005,7 +6005,7 @@ B")] 0****** ******* *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Bottom, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.End, TextDirection.BottomTop_RightLeft, @" ******* ******* 4****** @@ -6013,7 +6013,7 @@ B")] 你***** ****** 0******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Centered, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Center, TextDirection.BottomTop_RightLeft, @" ******* 4****** ****** @@ -6021,7 +6021,7 @@ B")] ****** 0****** *******")] - [InlineData ("0 你 4", Alignment.Justified, Alignment.Justified, TextDirection.BottomTop_RightLeft, @" + [InlineData ("0 你 4", Alignment.Fill, Alignment.Fill, TextDirection.BottomTop_RightLeft, @" 4****** ****** ****** diff --git a/UnitTests/View/DrawTests.cs b/UnitTests/View/DrawTests.cs index f884a37f6..378fd8016 100644 --- a/UnitTests/View/DrawTests.cs +++ b/UnitTests/View/DrawTests.cs @@ -339,7 +339,7 @@ public class DrawTests (ITestOutputHelper _output) Text = "Test", Width = 6, Height = 1, - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, ColorScheme = Colors.ColorSchemes ["Base"] }; @@ -350,7 +350,7 @@ public class DrawTests (ITestOutputHelper _output) Y = 1, Width = 1, Height = 6, - VerticalTextAlignment = Alignment.Bottom, + VerticalTextAlignment = Alignment.End, ColorScheme = Colors.ColorSchemes ["Base"] }; Toplevel top = new (); diff --git a/UnitTests/View/Layout/Dim.AutoTests.cs b/UnitTests/View/Layout/Dim.AutoTests.cs index 711e75dc2..e77d3ce48 100644 --- a/UnitTests/View/Layout/Dim.AutoTests.cs +++ b/UnitTests/View/Layout/Dim.AutoTests.cs @@ -787,11 +787,11 @@ public class DimAutoTests (ITestOutputHelper output) Assert.False (view.TextFormatter.AutoSize); Assert.Equal (Size.Empty, view.Frame.Size); - view.TextFormatter.Alignment = Alignment.Justified; + view.TextFormatter.Alignment = Alignment.Fill; Assert.False (view.TextFormatter.AutoSize); Assert.Equal (Size.Empty, view.Frame.Size); - view.TextFormatter.VerticalAlignment = Alignment.Centered; + view.TextFormatter.VerticalAlignment = Alignment.Center; Assert.False (view.TextFormatter.AutoSize); Assert.Equal (Size.Empty, view.Frame.Size); @@ -815,11 +815,11 @@ public class DimAutoTests (ITestOutputHelper output) Assert.False (view.TextFormatter.AutoSize); Assert.Equal (Size.Empty, view.Frame.Size); - view.TextAlignment = Alignment.Justified; + view.TextAlignment = Alignment.Fill; Assert.False (view.TextFormatter.AutoSize); Assert.Equal (Size.Empty, view.Frame.Size); - view.VerticalTextAlignment = Alignment.Centered; + view.VerticalTextAlignment = Alignment.Center; Assert.False (view.TextFormatter.AutoSize); Assert.Equal (Size.Empty, view.Frame.Size); @@ -844,7 +844,7 @@ public class DimAutoTests (ITestOutputHelper output) Assert.False (view.TextFormatter.AutoSize); Assert.NotEqual (Size.Empty, view.Frame.Size); - view.TextAlignment = Alignment.Justified; + view.TextAlignment = Alignment.Fill; Assert.False (view.TextFormatter.AutoSize); Assert.NotEqual (Size.Empty, view.Frame.Size); @@ -853,7 +853,7 @@ public class DimAutoTests (ITestOutputHelper output) Text = "_1234", Width = Dim.Auto () }; - view.VerticalTextAlignment = Alignment.Centered; + view.VerticalTextAlignment = Alignment.Center; Assert.False (view.TextFormatter.AutoSize); Assert.NotEqual (Size.Empty, view.Frame.Size); diff --git a/UnitTests/View/Layout/Pos.AlignTests.cs b/UnitTests/View/Layout/Pos.AlignTests.cs index 78bf4183d..688be066b 100644 --- a/UnitTests/View/Layout/Pos.AlignTests.cs +++ b/UnitTests/View/Layout/Pos.AlignTests.cs @@ -1,7 +1,4 @@ -using Xunit.Abstractions; -using static Terminal.Gui.Dim; -using static Terminal.Gui.Pos; - + namespace Terminal.Gui.PosDimTests; public class PosAlignTests () @@ -9,15 +6,15 @@ public class PosAlignTests () [Fact] public void PosAlign_Constructor () { - var posAlign = new PosAlign (Alignment.Justified); + var posAlign = new PosAlign (Alignment.Fill); Assert.NotNull (posAlign); } [Theory] - [InlineData (Alignment.Left, Alignment.Left, true)] - [InlineData (Alignment.Centered, Alignment.Centered, true)] - [InlineData (Alignment.Left, Alignment.Centered, false)] - [InlineData (Alignment.Centered, Alignment.Left, false)] + [InlineData (Alignment.Start, Alignment.Start, true)] + [InlineData (Alignment.Center, Alignment.Center, true)] + [InlineData (Alignment.Start, Alignment.Center, false)] + [InlineData (Alignment.Center, Alignment.Start, false)] public void PosAlign_Equals (Alignment align1, Alignment align2, bool expectedEquals) { var posAlign1 = new PosAlign (align1); @@ -30,8 +27,8 @@ public class PosAlignTests () [Fact] public void PosAlign_ToString () { - var posAlign = new PosAlign (Alignment.Justified); - var expectedString = "Align(groupId=0, alignment=Justified)"; + var posAlign = new PosAlign (Alignment.Fill); + var expectedString = "Align(groupId=0, alignment=Fill)"; Assert.Equal (expectedString, posAlign.ToString ()); } @@ -39,7 +36,7 @@ public class PosAlignTests () [Fact] public void PosAlign_Anchor () { - var posAlign = new PosAlign (Alignment.Left); + var posAlign = new PosAlign (Alignment.Start); var width = 50; var expectedAnchor = -width; @@ -49,7 +46,7 @@ public class PosAlignTests () [Fact] public void PosAlign_CreatesCorrectInstance () { - var pos = Pos.Align (Alignment.Left); + var pos = Pos.Align (Alignment.Start); Assert.IsType (pos); } diff --git a/UnitTests/View/TextTests.cs b/UnitTests/View/TextTests.cs index 799668f10..66b639adc 100644 --- a/UnitTests/View/TextTests.cs +++ b/UnitTests/View/TextTests.cs @@ -850,7 +850,7 @@ Y Y = 1, Width = width, Height = 1, - TextAlignment = Alignment.Centered + TextAlignment = Alignment.Center }; if (autoSize) @@ -865,7 +865,7 @@ Y Y = 2, Width = width, Height = 1, - TextAlignment = Alignment.Right + TextAlignment = Alignment.End }; if (autoSize) @@ -880,7 +880,7 @@ Y Y = 3, Width = width, Height = 1, - TextAlignment = Alignment.Justified + TextAlignment = Alignment.Fill }; if (autoSize) @@ -974,7 +974,7 @@ Y Width = 1, Height = height, TextDirection = TextDirection.TopBottom_LeftRight, - VerticalTextAlignment = Alignment.Centered + VerticalTextAlignment = Alignment.Center }; if (autoSize) @@ -990,7 +990,7 @@ Y Width = 1, Height = height, TextDirection = TextDirection.TopBottom_LeftRight, - VerticalTextAlignment = Alignment.Bottom + VerticalTextAlignment = Alignment.End }; if (autoSize) @@ -1006,7 +1006,7 @@ Y Width = 1, Height = height, TextDirection = TextDirection.TopBottom_LeftRight, - VerticalTextAlignment = Alignment.Justified + VerticalTextAlignment = Alignment.Fill }; if (autoSize) @@ -1227,7 +1227,7 @@ Y { Text = "01234", TextDirection = TextDirection.LeftRight_TopBottom, - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 10, Height = Dim.Auto (DimAutoStyle.Text) }; diff --git a/UnitTests/Views/ButtonTests.cs b/UnitTests/Views/ButtonTests.cs index 05e382bee..51e1faaea 100644 --- a/UnitTests/Views/ButtonTests.cs +++ b/UnitTests/Views/ButtonTests.cs @@ -155,14 +155,14 @@ public class ButtonTests (ITestOutputHelper output) Assert.Equal ($"{CM.Glyphs.LeftBracket} {CM.Glyphs.RightBracket}", btn.TextFormatter.Text); Assert.False (btn.IsDefault); - Assert.Equal (Alignment.Centered, btn.TextAlignment); + Assert.Equal (Alignment.Center, btn.TextAlignment); Assert.Equal ('_', btn.HotKeySpecifier.Value); Assert.True (btn.CanFocus); Assert.Equal (new (0, 0, 4, 1), btn.Viewport); Assert.Equal (new (0, 0, 4, 1), btn.Frame); Assert.Equal ($"{CM.Glyphs.LeftBracket} {CM.Glyphs.RightBracket}", btn.TextFormatter.Text); Assert.False (btn.IsDefault); - Assert.Equal (Alignment.Centered, btn.TextAlignment); + Assert.Equal (Alignment.Center, btn.TextAlignment); Assert.Equal ('_', btn.HotKeySpecifier.Value); Assert.True (btn.CanFocus); Assert.Equal (new (0, 0, 4, 1), btn.Viewport); @@ -195,7 +195,7 @@ public class ButtonTests (ITestOutputHelper output) btn.TextFormatter.Format () ); Assert.True (btn.IsDefault); - Assert.Equal (Alignment.Centered, btn.TextAlignment); + Assert.Equal (Alignment.Center, btn.TextAlignment); Assert.True (btn.CanFocus); btn.SetRelativeLayout (new (100, 100)); @@ -222,7 +222,7 @@ public class ButtonTests (ITestOutputHelper output) btn.TextFormatter.Format () ); Assert.True (btn.IsDefault); - Assert.Equal (Alignment.Centered, btn.TextAlignment); + Assert.Equal (Alignment.Center, btn.TextAlignment); Assert.Equal ('_', btn.HotKeySpecifier.Value); Assert.True (btn.CanFocus); diff --git a/UnitTests/Views/CheckBoxTests.cs b/UnitTests/Views/CheckBoxTests.cs index 5c40d9908..cfaf2088c 100644 --- a/UnitTests/Views/CheckBoxTests.cs +++ b/UnitTests/Views/CheckBoxTests.cs @@ -251,7 +251,7 @@ public class CheckBoxTests X = 1, Y = Pos.Center (), Text = "Check this out 你", - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 25 }; var win = new Window { Width = Dim.Fill (), Height = Dim.Fill (), Title = "Test Demo 你" }; @@ -262,7 +262,7 @@ public class CheckBoxTests Application.Begin (top); ((FakeDriver)Application.Driver).SetBufferSize (30, 5); - Assert.Equal (Alignment.Centered, checkBox.TextAlignment); + Assert.Equal (Alignment.Center, checkBox.TextAlignment); Assert.Equal (new (1, 1, 25, 1), checkBox.Frame); Assert.Equal (_size25x1, checkBox.TextFormatter.Size); @@ -301,7 +301,7 @@ public class CheckBoxTests X = 1, Y = Pos.Center (), Text = "Check first out 你", - TextAlignment = Alignment.Justified, + TextAlignment = Alignment.Fill, Width = 25 }; @@ -310,7 +310,7 @@ public class CheckBoxTests X = 1, Y = Pos.Bottom (checkBox1), Text = "Check second out 你", - TextAlignment = Alignment.Justified, + TextAlignment = Alignment.Fill, Width = 25 }; var win = new Window { Width = Dim.Fill (), Height = Dim.Fill (), Title = "Test Demo 你" }; @@ -321,9 +321,9 @@ public class CheckBoxTests Application.Begin (top); ((FakeDriver)Application.Driver).SetBufferSize (30, 6); - Assert.Equal (Alignment.Justified, checkBox1.TextAlignment); + Assert.Equal (Alignment.Fill, checkBox1.TextAlignment); Assert.Equal (new (1, 1, 25, 1), checkBox1.Frame); - Assert.Equal (Alignment.Justified, checkBox2.TextAlignment); + Assert.Equal (Alignment.Fill, checkBox2.TextAlignment); Assert.Equal (new (1, 2, 25, 1), checkBox2.Frame); var expected = @$" @@ -378,7 +378,7 @@ public class CheckBoxTests Application.Begin (top); ((FakeDriver)Application.Driver).SetBufferSize (30, 5); - Assert.Equal (Alignment.Left, checkBox.TextAlignment); + Assert.Equal (Alignment.Start, checkBox.TextAlignment); Assert.Equal (new (1, 1, 25, 1), checkBox.Frame); Assert.Equal (_size25x1, checkBox.TextFormatter.Size); @@ -417,7 +417,7 @@ public class CheckBoxTests X = 1, Y = Pos.Center (), Text = "Check this out 你", - TextAlignment = Alignment.Right, + TextAlignment = Alignment.End, Width = 25 }; var win = new Window { Width = Dim.Fill (), Height = Dim.Fill (), Title = "Test Demo 你" }; @@ -428,7 +428,7 @@ public class CheckBoxTests Application.Begin (top); ((FakeDriver)Application.Driver).SetBufferSize (30, 5); - Assert.Equal (Alignment.Right, checkBox.TextAlignment); + Assert.Equal (Alignment.End, checkBox.TextAlignment); Assert.Equal (new (1, 1, 25, 1), checkBox.Frame); Assert.Equal (_size25x1, checkBox.TextFormatter.Size); diff --git a/UnitTests/Views/LabelTests.cs b/UnitTests/Views/LabelTests.cs index 410988243..d8f734889 100644 --- a/UnitTests/Views/LabelTests.cs +++ b/UnitTests/Views/LabelTests.cs @@ -207,7 +207,7 @@ public class LabelTests { var label = new Label (); Assert.Equal (string.Empty, label.Text); - Assert.Equal (Alignment.Left, label.TextAlignment); + Assert.Equal (Alignment.Start, label.TextAlignment); Assert.False (label.CanFocus); Assert.Equal (new Rectangle (0, 0, 0, 0), label.Frame); Assert.Equal (KeyCode.Null, label.HotKey); diff --git a/UnitTests/Views/TextValidateFieldTests.cs b/UnitTests/Views/TextValidateFieldTests.cs index e42fd4221..96a0d6d17 100644 --- a/UnitTests/Views/TextValidateFieldTests.cs +++ b/UnitTests/Views/TextValidateFieldTests.cs @@ -10,7 +10,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, // **** @@ -44,7 +44,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Left, + TextAlignment = Alignment.Start, Width = 30, // **** @@ -81,7 +81,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, // **** @@ -115,7 +115,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, // * @@ -137,7 +137,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, // * @@ -161,7 +161,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, // **** @@ -179,7 +179,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, // **** @@ -196,7 +196,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, // **** @@ -214,7 +214,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, // * @@ -233,7 +233,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, // * @@ -253,7 +253,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, // ** ** @@ -283,7 +283,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, // * @@ -308,7 +308,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Left, + TextAlignment = Alignment.Start, Width = 30, // **** @@ -338,7 +338,7 @@ public class TextValidateField_NET_Provider_Tests var field = new TextValidateField { - TextAlignment = Alignment.Left, Width = 30, Provider = new NetMaskedTextProvider ("--(0000)--") + TextAlignment = Alignment.Start, Width = 30, Provider = new NetMaskedTextProvider ("--(0000)--") }; field.Provider.TextChanged += (sender, e) => wasTextChanged = true; @@ -356,7 +356,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, // * @@ -381,7 +381,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Left, + TextAlignment = Alignment.Start, Width = 30, // **** @@ -400,7 +400,7 @@ public class TextValidateField_NET_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, // **** @@ -540,7 +540,7 @@ public class TextValidateField_Regex_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, Provider = new TextRegexProvider ("^[0-9][0-9][0-9]$") { ValidateOnInput = false } }; @@ -596,7 +596,7 @@ public class TextValidateField_Regex_Provider_Tests var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, Provider = new TextRegexProvider ("^[0-9][0-9][0-9]$") { ValidateOnInput = false } }; @@ -616,7 +616,7 @@ public class TextValidateField_Regex_Provider_Tests { var field = new TextValidateField { - TextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, Width = 20, Provider = new TextRegexProvider ("^[0-9][0-9][0-9]$") { ValidateOnInput = false } }; diff --git a/UnitTests/Views/ToplevelTests.cs b/UnitTests/Views/ToplevelTests.cs index ec8c07dbe..62f4580fc 100644 --- a/UnitTests/Views/ToplevelTests.cs +++ b/UnitTests/Views/ToplevelTests.cs @@ -1453,8 +1453,8 @@ public class ToplevelTests Y = Pos.Center (), Width = Dim.Fill (), Height = Dim.Fill (), - TextAlignment = Alignment.Centered, - VerticalTextAlignment = Alignment.Centered, + TextAlignment = Alignment.Center, + VerticalTextAlignment = Alignment.Center, Text = "Test" } );