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

Merge pull request #506 from tig/label

Browse Source 
Fixed label and updated TextAlignment scenario
This commit is contained in:
Charlie Kindel
2020-05-22 18:35:35 -06:00
committed by GitHub
parent c12a62c137 c3ee01dc3e
commit 7bbbe03691
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Terminal.Gui/Views/Label.cs
View File

@@ -179,7 +179,7 @@ namespace Terminal.Gui {
int x;
switch (textAlignment) {
case TextAlignment.Left:
x = Frame.Left;
x = 0;
break;
case TextAlignment.Justified:
Recalc ();

31
UICatalog/Scenarios/TextAlignment.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using Terminal.Gui;
@@ -9,18 +10,24 @@ namespace UICatalog {
public override void Setup ()
{
int i = 1;
string txt = "Hello world, how are you doing today";
var labelList = new List<Label> ();
labelList.Add (new Label ($"Label:"));
labelList.Add (new Label ($"{i++}-{txt}") { TextAlignment = Terminal.Gui.TextAlignment.Left, Width = Dim.Fill (1), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()) + 1 });
labelList.Add (new Label ($"{i++}-{txt}") { TextAlignment = Terminal.Gui.TextAlignment.Right, Width = Dim.Fill (1), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()) + 1 });
labelList.Add (new Label ($"{i++}-{txt}") { TextAlignment = Terminal.Gui.TextAlignment.Centered, Width = Dim.Fill (1), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()) + 1 });
labelList.Add (new Label ($"{i++}-{txt}") { TextAlignment = Terminal.Gui.TextAlignment.Justified, Width = Dim.Fill (1), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()) + 1 });
txt += "\nSecond line";
labelList.Add (new Label ($"{i++}-{txt}") { TextAlignment = Terminal.Gui.TextAlignment.Left, Width = Dim.Fill (1), Height = 4, X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()) + 1 });
string txt = "Hello world, how are you doing today?";
Win.Add (labelList.ToArray ());
Win.LayoutSubviews ();
var alignments = Enum.GetValues (typeof (Terminal.Gui.TextAlignment)).Cast<Terminal.Gui.TextAlignment> ().ToList();
foreach (var alignment in alignments) {
Win.Add (new Label ($"{alignment}:") { Y = ++i });
Win.Add (new Label (txt) { TextAlignment = alignment, Y = i++, Width = Dim.Fill(), ColorScheme = Colors.Dialog });
}
// Demonstrate that wrapping labels are not yet implemented (#352)
txt += "\nSecond line";
Win.Add (new Label ($"Demonstrating multi-line (note wrap is not yet implemented):") { Y = ++i });
foreach (var alignment in alignments) {
Win.Add (new Label ($"{alignment}:") { Y = ++i });
Win.Add (new Label (txt) { TextAlignment = alignment, Y = ++i, Width = Dim.Fill (), Height = 2, ColorScheme = Colors.Dialog });
i += 2;
}
}
}
}