Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #3875. Add left and right tab sides with alignments to the TabView. #3876

Open
wants to merge 21 commits into
base: v2_develop
Choose a base branch
from
Open

Fixes #3875. Add left and right tab sides with alignments to the TabView. #3876

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
cb7682f
Add TabSide enum.
BDisp Nov 25, 2024
6dd1016
Rename to ShowInitialLine.
BDisp Nov 25, 2024
58e929d
Replace ShowTopLine with ShowInitialLine.
BDisp Nov 26, 2024
a1d1413
Replace TabsOnBottom_False with TabsSide_Top.
BDisp Nov 26, 2024
76332b2
Replace TabsOnBottom_True with TabsSide_Bottom.
BDisp Nov 26, 2024
b2b3288
Fix bug that was passing the TabRow.Viewport instead of the TabView.V…
BDisp Nov 26, 2024
7d6bb37
Add DisplayTextChanged event.
BDisp Nov 27, 2024
9724625
Fix unit test. Now F6 focus the select tab.
BDisp Nov 27, 2024
fa1bdae
Add Command.Up and Command.Down.
BDisp Nov 28, 2024
427d118
Starting TabSide.Left feature.
BDisp Nov 28, 2024
bb0491e
Add up and down arrows feature.
BDisp Nov 28, 2024
3c6e8a1
Cleanup Point.
BDisp Nov 28, 2024
ee4923e
Implemented almost left side feature.
BDisp Nov 30, 2024
bd66693
Implemented right side feature.
BDisp Dec 1, 2024
43c83ee
Fix ShowInitialLine right side bug.
BDisp Dec 2, 2024
97c2d52
Add TabsTextAlignment feature.
BDisp Dec 2, 2024
1c77b07
Fixes #3873. TextFormatter isn't properly handling combining marks on…
BDisp Dec 2, 2024
313adf7
Merge branch 'v2_3873_textformatter-combining-marks-fix' into v2_tabv…
BDisp Dec 2, 2024
c932306
Fix bug with the _rightDownScrollIndicator.
BDisp Dec 3, 2024
ca6d61e
Merge branch 'v2_develop' into v2_3875_tabview-left-right-alignment-f…
BDisp Dec 7, 2024
56aba4f
Merge branch 'v2_develop' into v2_3875_tabview-left-right-alignment-f…
tig Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Terminal.Gui/Text/TextFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1411,7 +1411,7 @@ public static string ClipAndJustify (

if (textFormatter is { Alignment: Alignment.Center })
{
return GetRangeThatFits (runes, Math.Max ((runes.Count - width) / 2, 0), text, width, tabWidth, textDirection);
return GetRangeThatFits (runes, Math.Max ((runes.Count - width - zeroLength) / 2, 0), text, width, tabWidth, textDirection);
}

return GetRangeThatFits (runes, 0, text, width, tabWidth, textDirection);
Expand All @@ -1426,7 +1426,7 @@ public static string ClipAndJustify (

if (textFormatter is { VerticalAlignment: Alignment.Center })
{
return GetRangeThatFits (runes, Math.Max ((runes.Count - width) / 2, 0), text, width, tabWidth, textDirection);
return GetRangeThatFits (runes, Math.Max ((runes.Count - width - zeroLength) / 2, 0), text, width, tabWidth, textDirection);
}

return GetRangeThatFits (runes, 0, text, width, tabWidth, textDirection);
Expand All @@ -1451,7 +1451,7 @@ public static string ClipAndJustify (
}
else if (textFormatter is { Alignment: Alignment.Center })
{
return GetRangeThatFits (runes, Math.Max ((runes.Count - width) / 2, 0), text, width, tabWidth, textDirection);
return GetRangeThatFits (runes, Math.Max ((runes.Count - width - zeroLength) / 2, 0), text, width, tabWidth, textDirection);
}
else if (GetRuneWidth (text, tabWidth, textDirection) > width)
{
Expand All @@ -1470,7 +1470,7 @@ public static string ClipAndJustify (
}
else if (textFormatter is { VerticalAlignment: Alignment.Center })
{
return GetRangeThatFits (runes, Math.Max ((runes.Count - width) / 2, 0), text, width, tabWidth, textDirection);
return GetRangeThatFits (runes, Math.Max ((runes.Count - width - zeroLength) / 2, 0), text, width, tabWidth, textDirection);
}
else if (runes.Count - zeroLength > width)
{
Expand Down Expand Up @@ -1526,7 +1526,7 @@ public static string Justify (
}
else
{
textCount = words.Sum (arg => arg.GetRuneCount ());
textCount = words.Sum (arg => arg.GetRuneCount ()) - text.EnumerateRunes ().Sum (r => r.GetColumns () == 0 ? 1 : 0);
}

int spaces = words.Length > 1 ? (width - textCount) / (words.Length - 1) : 0;
Expand Down Expand Up @@ -1936,7 +1936,7 @@ private static int GetRuneWidth (List<Rune> runes, int tabWidth, TextDirection t

private static int GetRuneWidth (Rune rune, int tabWidth, TextDirection textDirection = TextDirection.LeftRight_TopBottom)
{
int runeWidth = IsHorizontalDirection (textDirection) ? rune.GetColumns () : 1;
int runeWidth = IsHorizontalDirection (textDirection) ? rune.GetColumns () : rune.GetColumns () == 0 ? 0 : 1;

if (rune.Value == '\t')
{
Expand Down
6 changes: 6 additions & 0 deletions Terminal.Gui/Views/TabView/Tab.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,17 @@ public string DisplayText
set
{
_displayText = value;
DisplayTextChanged?.Invoke (this, EventArgs.Empty);
SetNeedsLayout ();
}
}

/// <summary>The control to display when the tab is selected.</summary>
/// <value></value>
public View? View { get; set; }

/// <summary>
/// Raised when <see cref="DisplayText"/> changed.
/// </summary>
public event EventHandler? DisplayTextChanged;
}
Loading
Loading