Skip to content

Fixes #2358 - BREAKING CHANGE: Pos.Combine is incorrect for scenarios involving PosAbsolute #2379

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

Closed
tig wants to merge 16 commits into from
Closed

Fixes #2358 - BREAKING CHANGE: Pos.Combine is incorrect for scenarios involving PosAbsolute #2379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6bb90ed
Revert "Illustrates #2331 (Scrollview not respecting clip) does not r…
tig Feb 20, 2023
2b0adf0
Merge branch 'visual_style_manager' into v2_config_manager
tig Feb 21, 2023
b5de3e6
Merge branch 'develop' of tig:gui-cs/Terminal.Gui into develop
tig Feb 21, 2023
a8b75b6
Refactored SetRelativeLayout etc; looks good but tests fail
tig Feb 24, 2023
1219414
fixed da bug; also fixed pwsh clipboard tests
tig Feb 24, 2023
7d36a84
Merge branch 'develop' into v1_setrelativelayout_improvments
tig Feb 24, 2023
d04bf94
merged from develop after accident
tig Feb 24, 2023
c732923
merged from develop after accident
tig Feb 24, 2023
eb3af67
fixing bugs caused by Pos.Combine bugfix
tig Feb 24, 2023
c11b4e3
fixed more bugs exposed by Pos.Combine bugfix
tig Feb 24, 2023
a0c44b7
restored Generic.cs
tig Feb 24, 2023
7fbece9
Pos.Combine unit tests
tig Feb 24, 2023
eaede47
Merge branch 'develop' into v1_setrelativelayout_improvement
tig Feb 26, 2023
5bb350b
re-merged changes lost from #2345
tig Feb 26, 2023
0e8cd63
Fixed Border Comparsion Pos.Center bugs
tig Feb 26, 2023
a9cd9ba
Fixed Borders on XXX Pos.Center bugs
tig Feb 26, 2023
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
80 changes: 40 additions & 40 deletions Terminal.Gui/Core/Border.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,39 +665,39 @@ private void DrawChildBorder (Rect frame, bool fill = true)

// Draw the upper BorderThickness
for (int r = frame.Y - drawMarginFrame - sumThickness.Top;
r < frame.Y - drawMarginFrame - padding.Top; r++) {
r > 0 && r < frame.Y - drawMarginFrame - padding.Top; r++) {
for (int c = frame.X - drawMarginFrame - sumThickness.Left;
c < Math.Min (frame.Right + drawMarginFrame + sumThickness.Right, driver.Cols); c++) {
c > 0 && c < Math.Min (frame.Right + drawMarginFrame + sumThickness.Right, driver.Cols); c++) {

AddRuneAt (driver, c, r, ' ');
}
}

// Draw the left BorderThickness
for (int r = frame.Y - drawMarginFrame - padding.Top;
r < Math.Min (frame.Bottom + drawMarginFrame + padding.Bottom, driver.Rows); r++) {
r > 0 && r < Math.Min (frame.Bottom + drawMarginFrame + padding.Bottom, driver.Rows); r++) {
for (int c = frame.X - drawMarginFrame - sumThickness.Left;
c < frame.X - drawMarginFrame - padding.Left; c++) {
c > 0 && c < frame.X - drawMarginFrame - padding.Left; c++) {

AddRuneAt (driver, c, r, ' ');
}
}

// Draw the right BorderThickness
for (int r = frame.Y - drawMarginFrame - padding.Top;
r < Math.Min (frame.Bottom + drawMarginFrame + padding.Bottom, driver.Rows); r++) {
r > 0 && r < Math.Min (frame.Bottom + drawMarginFrame + padding.Bottom, driver.Rows); r++) {
for (int c = frame.Right + drawMarginFrame + padding.Right;
c < Math.Min (frame.Right + drawMarginFrame + sumThickness.Right, driver.Cols); c++) {
c > 0 && c < Math.Min (frame.Right + drawMarginFrame + sumThickness.Right, driver.Cols); c++) {

AddRuneAt (driver, c, r, ' ');
}
}

// Draw the lower BorderThickness
for (int r = frame.Bottom + drawMarginFrame + padding.Bottom;
r < Math.Min (frame.Bottom + drawMarginFrame + sumThickness.Bottom, driver.Rows); r++) {
r > 0 && r > 0 && r < Math.Min (frame.Bottom + drawMarginFrame + sumThickness.Bottom, driver.Rows); r++) {
for (int c = frame.X - drawMarginFrame - sumThickness.Left;
c < Math.Min (frame.Right + drawMarginFrame + sumThickness.Right, driver.Cols); c++) {
c > 0 && c > 0 && c < Math.Min (frame.Right + drawMarginFrame + sumThickness.Right, driver.Cols); c++) {

AddRuneAt (driver, c, r, ' ');
}
Expand All @@ -707,39 +707,39 @@ private void DrawChildBorder (Rect frame, bool fill = true)

// Draw the upper Padding
for (int r = frame.Y - drawMarginFrame - padding.Top;
r < frame.Y - drawMarginFrame; r++) {
r > 0 && r < frame.Y - drawMarginFrame; r++) {
for (int c = frame.X - drawMarginFrame - padding.Left;
c < Math.Min (frame.Right + drawMarginFrame + padding.Right, driver.Cols); c++) {
c > 0 && c < Math.Min (frame.Right + drawMarginFrame + padding.Right, driver.Cols); c++) {

AddRuneAt (driver, c, r, ' ');
}
}

// Draw the left Padding
for (int r = frame.Y - drawMarginFrame;
r < Math.Min (frame.Bottom + drawMarginFrame, driver.Rows); r++) {
r > 0 && r < Math.Min (frame.Bottom + drawMarginFrame, driver.Rows); r++) {
for (int c = frame.X - drawMarginFrame - padding.Left;
c < frame.X - drawMarginFrame; c++) {
c > 0 && c < frame.X - drawMarginFrame; c++) {

AddRuneAt (driver, c, r, ' ');
}
}

// Draw the right Padding
for (int r = frame.Y - drawMarginFrame;
r < Math.Min (frame.Bottom + drawMarginFrame, driver.Rows); r++) {
r > 0 && r < Math.Min (frame.Bottom + drawMarginFrame, driver.Rows); r++) {
for (int c = frame.Right + drawMarginFrame;
c < Math.Min (frame.Right + drawMarginFrame + padding.Right, driver.Cols); c++) {
c > 0 && c < Math.Min (frame.Right + drawMarginFrame + padding.Right, driver.Cols); c++) {

AddRuneAt (driver, c, r, ' ');
}
}

// Draw the lower Padding
for (int r = frame.Bottom + drawMarginFrame;
r < Math.Min (frame.Bottom + drawMarginFrame + padding.Bottom, driver.Rows); r++) {
r > 0 && r < Math.Min (frame.Bottom + drawMarginFrame + padding.Bottom, driver.Rows); r++) {
for (int c = frame.X - drawMarginFrame - padding.Left;
c < Math.Min (frame.Right + drawMarginFrame + padding.Right, driver.Cols); c++) {
c > 0 && c < Math.Min (frame.Right + drawMarginFrame + padding.Right, driver.Cols); c++) {

AddRuneAt (driver, c, r, ' ');
}
Expand Down Expand Up @@ -820,39 +820,39 @@ private void DrawParentBorder (Rect frame, bool fill = true)

// Draw the upper BorderThickness
for (int r = frame.Y;
r < Math.Min (frame.Y + borderThickness.Top, frame.Bottom); r++) {
r > 0 && r < Math.Min (frame.Y + borderThickness.Top, frame.Bottom); r++) {
for (int c = frame.X;
c < Math.Min (frame.Right, driver.Cols); c++) {
c > 0 && c < Math.Min (frame.Right, driver.Cols); c++) {

AddRuneAt (driver, c, r, ' ');
}
}

// Draw the left BorderThickness
for (int r = Math.Min (frame.Y + borderThickness.Top, frame.Bottom);
r < Math.Min (frame.Bottom - borderThickness.Bottom, driver.Rows); r++) {
r > 0 && r < Math.Min (frame.Bottom - borderThickness.Bottom, driver.Rows); r++) {
for (int c = frame.X;
c < Math.Min (frame.X + borderThickness.Left, frame.Right); c++) {
c > 0 && c < Math.Min (frame.X + borderThickness.Left, frame.Right); c++) {

AddRuneAt (driver, c, r, ' ');
}
}

// Draw the right BorderThickness
for (int r = Math.Min (frame.Y + borderThickness.Top, frame.Bottom);
r < Math.Min (frame.Bottom - borderThickness.Bottom, driver.Rows); r++) {
r > 0 && r < Math.Min (frame.Bottom - borderThickness.Bottom, driver.Rows); r++) {
for (int c = Math.Max (frame.Right - borderThickness.Right, frame.X);
c < Math.Min (frame.Right, driver.Cols); c++) {
c > 0 && c < Math.Min (frame.Right, driver.Cols); c++) {

AddRuneAt (driver, c, r, ' ');
}
}

// Draw the lower BorderThickness
for (int r = Math.Max (frame.Bottom - borderThickness.Bottom, frame.Y);
r < Math.Min (frame.Bottom, driver.Rows); r++) {
r > 0 && r < Math.Min (frame.Bottom, driver.Rows); r++) {
for (int c = frame.X;
c < Math.Min (frame.Right, driver.Cols); c++) {
c > 0 && c < Math.Min (frame.Right, driver.Cols); c++) {

AddRuneAt (driver, c, r, ' ');
}
Expand All @@ -862,39 +862,39 @@ private void DrawParentBorder (Rect frame, bool fill = true)

// Draw the upper Padding
for (int r = frame.Y + borderThickness.Top;
r < Math.Min (frame.Y + sumThickness.Top, frame.Bottom - borderThickness.Bottom); r++) {
r > 0 && r < Math.Min (frame.Y + sumThickness.Top, frame.Bottom - borderThickness.Bottom); r++) {
for (int c = frame.X + borderThickness.Left;
c < Math.Min (frame.Right - borderThickness.Right, driver.Cols); c++) {
c > 0 && c < Math.Min (frame.Right - borderThickness.Right, driver.Cols); c++) {

AddRuneAt (driver, c, r, ' ');
}
}

// Draw the left Padding
for (int r = frame.Y + sumThickness.Top;
r < Math.Min (frame.Bottom - sumThickness.Bottom, driver.Rows); r++) {
r > 0 && r < Math.Min (frame.Bottom - sumThickness.Bottom, driver.Rows); r++) {
for (int c = frame.X + borderThickness.Left;
c < Math.Min (frame.X + sumThickness.Left, frame.Right - borderThickness.Right); c++) {
c > 0 && c < Math.Min (frame.X + sumThickness.Left, frame.Right - borderThickness.Right); c++) {

AddRuneAt (driver, c, r, ' ');
}
}

// Draw the right Padding
for (int r = frame.Y + sumThickness.Top;
r < Math.Min (frame.Bottom - sumThickness.Bottom, driver.Rows); r++) {
r > 0 && r < Math.Min (frame.Bottom - sumThickness.Bottom, driver.Rows); r++) {
for (int c = Math.Max (frame.Right - sumThickness.Right, frame.X + sumThickness.Left);
c < Math.Max (frame.Right - borderThickness.Right, frame.X + sumThickness.Left); c++) {
c > 0 && c < Math.Max (frame.Right - borderThickness.Right, frame.X + sumThickness.Left); c++) {

AddRuneAt (driver, c, r, ' ');
}
}

// Draw the lower Padding
for (int r = Math.Max (frame.Bottom - sumThickness.Bottom, frame.Y + borderThickness.Top);
r < Math.Min (frame.Bottom - borderThickness.Bottom, driver.Rows); r++) {
r > 0 && r < Math.Min (frame.Bottom - borderThickness.Bottom, driver.Rows); r++) {
for (int c = frame.X + borderThickness.Left;
c < Math.Min (frame.Right - borderThickness.Right, driver.Cols); c++) {
c > 0 && c < Math.Min (frame.Right - borderThickness.Right, driver.Cols); c++) {

AddRuneAt (driver, c, r, ' ');
}
Expand All @@ -921,39 +921,39 @@ private void DrawParentBorder (Rect frame, bool fill = true)

// Draw the upper Effect3D
for (int r = Math.Max (frame.Y + effect3DOffset.Y, 0);
r < frame.Y; r++) {
r > 0 && r < frame.Y; r++) {
for (int c = Math.Max (frame.X + effect3DOffset.X, 0);
c < Math.Min (frame.Right + effect3DOffset.X, driver.Cols); c++) {
c > 0 && c < Math.Min (frame.Right + effect3DOffset.X, driver.Cols); c++) {

AddRuneAt (driver, c, r, (Rune)driver.Contents [r, c, 0]);
}
}

// Draw the left Effect3D
for (int r = Math.Max (frame.Y + effect3DOffset.Y, 0);
r < Math.Min (frame.Bottom + effect3DOffset.Y, driver.Rows); r++) {
r > 0 && r < Math.Min (frame.Bottom + effect3DOffset.Y, driver.Rows); r++) {
for (int c = Math.Max (frame.X + effect3DOffset.X, 0);
c < frame.X; c++) {
c > 0 && c < frame.X; c++) {

AddRuneAt (driver, c, r, (Rune)driver.Contents [r, c, 0]);
}
}

// Draw the right Effect3D
for (int r = Math.Max (frame.Y + effect3DOffset.Y, 0);
r < Math.Min (frame.Bottom + effect3DOffset.Y, driver.Rows); r++) {
r > 0 && r < Math.Min (frame.Bottom + effect3DOffset.Y, driver.Rows); r++) {
for (int c = frame.Right;
c < Math.Min (frame.Right + effect3DOffset.X, driver.Cols); c++) {
c > 0 && c < Math.Min (frame.Right + effect3DOffset.X, driver.Cols); c++) {

AddRuneAt (driver, c, r, (Rune)driver.Contents [r, c, 0]);
}
}

// Draw the lower Effect3D
for (int r = frame.Bottom;
r < Math.Min (frame.Bottom + effect3DOffset.Y, driver.Rows); r++) {
r > 0 && r < Math.Min (frame.Bottom + effect3DOffset.Y, driver.Rows); r++) {
for (int c = Math.Max (frame.X + effect3DOffset.X, 0);
c < Math.Min (frame.Right + effect3DOffset.X, driver.Cols); c++) {
c > 0 && c < Math.Min (frame.Right + effect3DOffset.X, driver.Cols); c++) {

AddRuneAt (driver, c, r, (Rune)driver.Contents [r, c, 0]);
}
Expand Down
28 changes: 14 additions & 14 deletions Terminal.Gui/Core/PosDim.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ internal override int Anchor (int width)

public override string ToString ()
{
return $"Pos.PosFunc({function ()})";
return $"PosFunc({function ()})";
}

public override int GetHashCode () => function.GetHashCode ();
Expand Down Expand Up @@ -85,7 +85,7 @@ internal override int Anchor (int width)

public override string ToString ()
{
return $"Pos.Factor({factor})";
return $"Factor({factor})";
}

public override int GetHashCode () => factor.GetHashCode ();
Expand Down Expand Up @@ -135,7 +135,7 @@ internal override int Anchor (int width)

public override string ToString ()
{
return $"Pos.AnchorEnd(margin={n})";
return $"AnchorEnd({n})";
}
}

Expand Down Expand Up @@ -174,7 +174,7 @@ internal override int Anchor (int width)

public override string ToString ()
{
return "Pos.Center";
return "Center";
}
}

Expand Down Expand Up @@ -209,7 +209,7 @@ internal class PosAbsolute : Pos {

public override string ToString ()
{
return $"Pos.Absolute({n})";
return $"Absolute({n})";
}

internal override int Anchor (int width)
Expand Down Expand Up @@ -244,7 +244,7 @@ public static Pos At (int n)

internal class PosCombine : Pos {
internal Pos left, right;
bool add;
internal bool add;
public PosCombine (bool add, Pos left, Pos right)
{
this.left = left;
Expand All @@ -264,7 +264,7 @@ internal override int Anchor (int width)

public override string ToString ()
{
return $"Pos.Combine({left.ToString ()}{(add ? '+' : '-')}{right.ToString ()})";
return $"Combine({left}{(add ? '+' : '-')}{right})";
}

}
Expand Down Expand Up @@ -345,7 +345,7 @@ public override string ToString ()
case 3: tside = "bottom"; break;
default: tside = "unknown"; break;
}
return $"Pos.View(side={tside}, target={Target.ToString ()})";
return $"View({tside},{Target.ToString()})";
}

public override int GetHashCode () => Target.GetHashCode ();
Expand Down Expand Up @@ -442,7 +442,7 @@ internal override int Anchor (int width)

public override string ToString ()
{
return $"Dim.DimFunc({function ()})";
return $"DimFunc({function ()})";
}

public override int GetHashCode () => function.GetHashCode ();
Expand Down Expand Up @@ -482,7 +482,7 @@ public bool IsFromRemaining ()

public override string ToString ()
{
return $"Dim.Factor(factor={factor}, remaining={remaining})";
return $"Factor({factor},{remaining})";
}

public override int GetHashCode () => factor.GetHashCode ();
Expand Down Expand Up @@ -522,7 +522,7 @@ internal class DimAbsolute : Dim {

public override string ToString ()
{
return $"Dim.Absolute({n})";
return $"Absolute({n})";
}

internal override int Anchor (int width)
Expand All @@ -541,7 +541,7 @@ internal class DimFill : Dim {

public override string ToString ()
{
return $"Dim.Fill(margin={margin})";
return $"Fill({margin})";
}

internal override int Anchor (int width)
Expand Down Expand Up @@ -613,7 +613,7 @@ internal override int Anchor (int width)

public override string ToString ()
{
return $"Dim.Combine({left.ToString ()}{(add ? '+' : '-')}{right.ToString ()})";
return $"Combine({left}{(add ? '+' : '-')}{right})";
}

}
Expand Down Expand Up @@ -691,7 +691,7 @@ public override string ToString ()
case 1: tside = "Width"; break;
default: tside = "unknown"; break;
}
return $"DimView(side={tside}, target={Target.ToString ()})";
return $"DimView({tside},{Target.ToString ()})";
}

public override int GetHashCode () => Target.GetHashCode ();
Expand Down
Loading