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

Justifier->Aligner

Browse Source
This commit is contained in:
Tig
2024-05-10 10:35:49 -06:00
parent 0df5133fc1
commit c5a6c907a4
54 changed files with 1229 additions and 1222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
UnitTests/Dialogs/DialogTests.cs
View File

@@ -32,7 +32,7 @@ public class DialogTests
Title = title,
Width = width,
Height = 1,
ButtonJustification = Justification.Centered,
ButtonJustification = Alignment.Centered,
Buttons = [new Button { Text = btn1Text }]
};
@@ -57,7 +57,7 @@ public class DialogTests
Title = title,
Width = width,
Height = 1,
ButtonJustification = Justification.Justified,
ButtonJustification = Alignment.Justified,
Buttons = [new Button { Text = btn1Text }]
};
@@ -82,7 +82,7 @@ public class DialogTests
Title = title,
Width = width,
Height = 1,
ButtonJustification = Justification.Right,
ButtonJustification = Alignment.Right,
Buttons = [new Button { Text = btn1Text }]
};
@@ -107,7 +107,7 @@ public class DialogTests
Title = title,
Width = width,
Height = 1,
ButtonJustification = Justification.Left,
ButtonJustification = Alignment.Left,
Buttons = [new Button { Text = btn1Text }]
};
@@ -155,7 +155,7 @@ public class DialogTests
(runstate, Dialog dlg) = RunButtonTestDialog (
title,
width,
Justification.Centered,
Alignment.Centered,
new Button { Text = btn1Text },
new Button { Text = btn2Text },
new Button { Text = btn3Text },
@@ -172,7 +172,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Justified,
Alignment.Justified,
new Button { Text = btn1Text },
new Button { Text = btn2Text },
new Button { Text = btn3Text },
@@ -189,7 +189,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Right,
Alignment.Right,
new Button { Text = btn1Text },
new Button { Text = btn2Text },
new Button { Text = btn3Text },
@@ -206,7 +206,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Left,
Alignment.Left,
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,
Justification.Centered,
Alignment.Centered,
new Button { Text = btn1Text },
new Button { Text = btn2Text },
new Button { Text = btn3Text },
@@ -266,7 +266,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Justified,
Alignment.Justified,
new Button { Text = btn1Text },
new Button { Text = btn2Text },
new Button { Text = btn3Text },
@@ -283,7 +283,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Right,
Alignment.Right,
new Button { Text = btn1Text },
new Button { Text = btn2Text },
new Button { Text = btn3Text },
@@ -299,7 +299,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Left,
Alignment.Left,
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,
Justification.Centered,
Alignment.Centered,
new Button { Text = btn1Text },
new Button { Text = btn2Text },
new Button { Text = btn3Text },
@@ -357,7 +357,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Justified,
Alignment.Justified,
new Button { Text = btn1Text },
new Button { Text = btn2Text },
new Button { Text = btn3Text },
@@ -374,7 +374,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Right,
Alignment.Right,
new Button { Text = btn1Text },
new Button { Text = btn2Text },
new Button { Text = btn3Text },
@@ -391,7 +391,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Left,
Alignment.Left,
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,
Justification.Centered,
Alignment.Centered,
new Button { Text = btn1Text },
new Button { Text = btn2Text },
new Button { Text = btn3Text },
@@ -451,7 +451,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Justified,
Alignment.Justified,
new Button { Text = btn1Text },
new Button { Text = btn2Text },
new Button { Text = btn3Text },
@@ -468,7 +468,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Right,
Alignment.Right,
new Button { Text = btn1Text },
new Button { Text = btn2Text },
new Button { Text = btn3Text },
@@ -485,7 +485,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Left,
Alignment.Left,
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,
Justification.Centered,
Alignment.Centered,
new Button { Text = btnText }
);
@@ -534,7 +534,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Justified,
Alignment.Justified,
new Button { Text = btnText }
);
TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
@@ -549,7 +549,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Right,
Alignment.Right,
new Button { Text = btnText }
);
TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
@@ -564,7 +564,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Left,
Alignment.Left,
new Button { Text = btnText }
);
TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
@@ -581,7 +581,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Centered,
Alignment.Centered,
new Button { Text = btnText }
);
TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
@@ -596,7 +596,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Justified,
Alignment.Justified,
new Button { Text = btnText }
);
TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
@@ -611,7 +611,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Right,
Alignment.Right,
new Button { Text = btnText }
);
TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
@@ -626,7 +626,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Left,
Alignment.Left,
new Button { Text = btnText }
);
TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
@@ -660,7 +660,7 @@ public class DialogTests
(runstate, Dialog dlg) = RunButtonTestDialog (
title,
width,
Justification.Centered,
Alignment.Centered,
new Button { Text = btn1Text },
new Button { Text = btn2Text },
new Button { Text = btn3Text }
@@ -676,7 +676,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Justified,
Alignment.Justified,
new Button { Text = btn1Text },
new Button { Text = btn2Text },
new Button { Text = btn3Text }
@@ -692,7 +692,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Right,
Alignment.Right,
new Button { Text = btn1Text },
new Button { Text = btn2Text },
new Button { Text = btn3Text }
@@ -708,7 +708,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Left,
Alignment.Left,
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,
Justification.Centered,
Alignment.Centered,
new Button { Text = btn1Text },
new Button { Text = btn2Text }
);
@@ -757,7 +757,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Justified,
Alignment.Justified,
new Button { Text = btn1Text },
new Button { Text = btn2Text }
);
@@ -772,7 +772,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Right,
Alignment.Right,
new Button { Text = btn1Text },
new Button { Text = btn2Text }
);
@@ -787,7 +787,7 @@ public class DialogTests
(runstate, dlg) = RunButtonTestDialog (
title,
width,
Justification.Left,
Alignment.Left,
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, Justification.Centered, button1, button2);
(runstate, dlg) = RunButtonTestDialog (title, width, Alignment.Centered, 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, Justification.Justified, button1, button2);
(runstate, dlg) = RunButtonTestDialog (title, width, Alignment.Justified, 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, Justification.Right, button1, button2);
(runstate, dlg) = RunButtonTestDialog (title, width, Alignment.Right, 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, Justification.Left, button1, button2);
(runstate, dlg) = RunButtonTestDialog (title, width, Alignment.Left, 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.DefaultButtonJustification = Justification.Centered;
Dialog.DefaultButtonJustification = Alignment.Centered;
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.DefaultButtonJustification = Justification.Centered;
Dialog.DefaultButtonJustification = Alignment.Centered;
Iteration += (s, a) =>
{
@@ -1008,7 +1008,7 @@ public class DialogTests
public void Dialog_Opened_From_Another_Dialog ()
{
((FakeDriver)Driver).SetBufferSize (30, 10);
Dialog.DefaultButtonJustification = Justification.Centered;
Dialog.DefaultButtonJustification = Alignment.Centered;
var btn1 = new Button { Text = "press me 1" };
Button btn2 = null;
@@ -1285,7 +1285,7 @@ public class DialogTests
(runstate, Dialog _) = RunButtonTestDialog (
title,
width,
Justification.Centered,
Alignment.Centered,
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, Justification.Centered, null);
(runstate, Dialog dlg) = RunButtonTestDialog (title, width, Alignment.Centered, null);
TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
End (runstate);
@@ -1348,7 +1348,7 @@ public class DialogTests
private (RunState, Dialog) RunButtonTestDialog (
string title,
int width,
Justification align,
Alignment align,
params Button [] btns
)
{