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

Dialog/MessageBox use new Justifier

Browse Source
This commit is contained in:
Tig
2024-05-10 07:47:03 -06:00
parent a19b024563
commit cd104e9163
8 changed files with 102 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
UnitTests/Dialogs/DialogTests.cs
View File

@@ -39,7 +39,7 @@ public class DialogTests
// Create with no top or bottom border to simplify testing button layout (no need to account for title etc..)
dlg.Border.Thickness = new (1, 0, 1, 0);
runstate = Begin (dlg);
var buttonRow = $"{CM.Glyphs.VLine} {btn1} {CM.Glyphs.VLine}";
var buttonRow = $"{CM.Glyphs.VLine} {btn1} {CM.Glyphs.VLine}";
TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
// Now add a second button
@@ -64,7 +64,7 @@ public class DialogTests
// Create with no top or bottom border to simplify testing button layout (no need to account for title etc..)
dlg.Border.Thickness = new (1, 0, 1, 0);
runstate = Begin (dlg);
buttonRow = $"{CM.Glyphs.VLine} {btn1}{CM.Glyphs.VLine}";
buttonRow = $"{CM.Glyphs.VLine}{btn1} {CM.Glyphs.VLine}";
TestHelpers.AssertDriverContentsWithFrameAre ($"{buttonRow}", _output);
// Now add a second button
@@ -166,7 +166,7 @@ public class DialogTests
dlg.Dispose ();
// Justify
buttonRow = $"{CM.Glyphs.VLine}{btn1} {btn2} {btn3} {btn4}{CM.Glyphs.VLine}";
buttonRow = $"{CM.Glyphs.VLine}{btn1} {btn2} {btn3} {btn4}{CM.Glyphs.VLine}";
Assert.Equal (width, buttonRow.Length);
(runstate, dlg) = RunButtonTestDialog (
@@ -243,7 +243,7 @@ public class DialogTests
// Default - Center
buttonRow =
$"{CM.Glyphs.VLine}es {CM.Glyphs.RightBracket} {btn2} {btn3} {CM.Glyphs.LeftBracket} neve{CM.Glyphs.VLine}";
$"{CM.Glyphs.VLine}{CM.Glyphs.LeftBracket} yes {CM.Glyphs.RightBracket}{btn2}{btn3}{CM.Glyphs.LeftBracket} neve{CM.Glyphs.VLine}";
(runstate, Dialog dlg) = RunButtonTestDialog (
title,
@@ -277,7 +277,8 @@ public class DialogTests
dlg.Dispose ();
// Right
buttonRow = $"{CM.Glyphs.VLine}{CM.Glyphs.RightBracket} {btn2} {btn3} {btn4}{CM.Glyphs.VLine}";
buttonRow = $"{CM.Glyphs.VLine}es {CM.Glyphs.RightBracket}{btn2}{btn3}{btn4}{CM.Glyphs.VLine}";
Assert.Equal (width, buttonRow.Length);
(runstate, dlg) = RunButtonTestDialog (
title,
@@ -293,7 +294,7 @@ public class DialogTests
dlg.Dispose ();
// Left
buttonRow = $"{CM.Glyphs.VLine}{btn1} {btn2} {btn3} {CM.Glyphs.LeftBracket} n{CM.Glyphs.VLine}";
buttonRow = $"{CM.Glyphs.VLine}{btn1}{btn2}{btn3}{CM.Glyphs.LeftBracket} neve{CM.Glyphs.VLine}";
(runstate, dlg) = RunButtonTestDialog (
title,
@@ -527,7 +528,7 @@ public class DialogTests
// Justify
buttonRow =
$"{CM.Glyphs.VLine} {CM.Glyphs.LeftBracket} {btnText} {CM.Glyphs.RightBracket}{CM.Glyphs.VLine}";
$"{CM.Glyphs.VLine}{CM.Glyphs.LeftBracket} {btnText} {CM.Glyphs.RightBracket} {CM.Glyphs.VLine}";
Assert.Equal (width, buttonRow.Length);
(runstate, dlg) = RunButtonTestDialog (
@@ -589,7 +590,7 @@ public class DialogTests
// Justify
buttonRow =
$"{CM.Glyphs.VLine} {CM.Glyphs.LeftBracket} {btnText} {CM.Glyphs.RightBracket}{CM.Glyphs.VLine}";
$"{CM.Glyphs.VLine}{CM.Glyphs.LeftBracket} {btnText} {CM.Glyphs.RightBracket} {CM.Glyphs.VLine}";
Assert.Equal (width, buttonRow.Length);
(runstate, dlg) = RunButtonTestDialog (
@@ -915,7 +916,7 @@ public class DialogTests
@"
┌┌───────────────┐─┐
││ │ │
││ ⟦ Ok ⟧ │ │
││ ⟦ Ok ⟧ │ │
│└───────────────┘ │
└──────────────────┘"
)]
@@ -925,7 +926,7 @@ public class DialogTests
┌┌───────────────┐─┐
││ │ │
││ │ │
││ ⟦ Ok ⟧ │ │
││ ⟦ Ok ⟧ │ │
│└───────────────┘ │
└──────────────────┘"
)]
@@ -936,7 +937,7 @@ public class DialogTests
│┌───────────────┐ │
││ │ │
││ │ │
││ ⟦ Ok ⟧ │ │
││ ⟦ Ok ⟧ │ │
│└───────────────┘ │
└──────────────────┘"
)]
@@ -948,7 +949,7 @@ public class DialogTests
││ │ │
││ │ │
││ │ │
││ ⟦ Ok ⟧ │ │
││ ⟦ Ok ⟧ │ │
│└───────────────┘ │
└──────────────────┘"
)]
@@ -961,7 +962,7 @@ public class DialogTests
││ │ │
││ │ │
││ │ │
││ ⟦ Ok ⟧ │ │
││ ⟦ Ok ⟧ │ │
│└───────────────┘ │
└──────────────────┘"
)]

12
UnitTests/Dialogs/MessageBoxTests.cs
View File

@@ -278,7 +278,7 @@ public class MessageBoxTests
│ffffffffffffffffff│
│ ffffffffffffff │
│ │
│ {btn} │
│ {btn} │
└──────────────────┘",
_output
);
@@ -302,7 +302,7 @@ public class MessageBoxTests
│ffffffffffffffffff│
│ffffffffffffffffff│
│ffffffffffffffffff│
│ {btn} │",
│ {btn} │",
_output
);
Application.RequestStop ();
@@ -377,7 +377,7 @@ ff ff ff ff ff ff ff
────────────────────
ffffffffffffffffffff
⟦► btn ◄⟧
⟦► btn ◄⟧
────────────────────
",
_output
@@ -459,7 +459,7 @@ ffffffffffffffffffff
│ffffffffffffffffff│
│ffffffffffffffffff│
│ffffffffffffffffff│
│ {btn} │",
│ {btn} │",
_output
);
Application.RequestStop ();
@@ -509,7 +509,7 @@ ffffffffffffffffffff
────────────────────
ffffffffffffffffffff
⟦► btn ◄⟧
⟦► btn ◄⟧
────────────────────
",
_output
@@ -529,7 +529,7 @@ ffffffffffffffffffff
────────────────────
ffffffffffffffffffff
⟦► btn ◄⟧
⟦► btn ◄⟧
────────────────────
",
_output