|
@@ -445,10 +445,12 @@ namespace Terminal.Gui {
|
|
|
|
|
|
private void Parent_Removed (View obj)
|
|
private void Parent_Removed (View obj)
|
|
{
|
|
{
|
|
- if (borderBrush != null) {
|
|
|
|
|
|
+ if (borderBrush != null)
|
|
|
|
+ {
|
|
BorderBrush = default;
|
|
BorderBrush = default;
|
|
}
|
|
}
|
|
- if (background != null) {
|
|
|
|
|
|
+ if (background != null)
|
|
|
|
+ {
|
|
Background = default;
|
|
Background = default;
|
|
}
|
|
}
|
|
child.Removed -= Parent_Removed;
|
|
child.Removed -= Parent_Removed;
|
|
@@ -798,7 +800,7 @@ namespace Terminal.Gui {
|
|
SetBorderBrush (driver);
|
|
SetBorderBrush (driver);
|
|
|
|
|
|
// Draw the upper BorderThickness
|
|
// Draw the upper BorderThickness
|
|
- for (int r = Math.Max (frame.Y, 0);
|
|
|
|
|
|
+ for (int r = frame.Y;
|
|
r < Math.Min (frame.Y + borderThickness.Top, frame.Bottom); r++) {
|
|
r < Math.Min (frame.Y + borderThickness.Top, frame.Bottom); r++) {
|
|
for (int c = frame.X;
|
|
for (int c = frame.X;
|
|
c < Math.Min (frame.Right, driver.Cols); c++) {
|
|
c < Math.Min (frame.Right, driver.Cols); c++) {
|
|
@@ -808,7 +810,7 @@ namespace Terminal.Gui {
|
|
}
|
|
}
|
|
|
|
|
|
// Draw the left BorderThickness
|
|
// Draw the left BorderThickness
|
|
- for (int r = Math.Max (Math.Min (frame.Y + borderThickness.Top, frame.Bottom), 0);
|
|
|
|
|
|
+ for (int r = Math.Min (frame.Y + borderThickness.Top, frame.Bottom);
|
|
r < Math.Min (frame.Bottom - borderThickness.Bottom, driver.Rows); r++) {
|
|
r < Math.Min (frame.Bottom - borderThickness.Bottom, driver.Rows); r++) {
|
|
for (int c = frame.X;
|
|
for (int c = frame.X;
|
|
c < Math.Min (frame.X + borderThickness.Left, frame.Right); c++) {
|
|
c < Math.Min (frame.X + borderThickness.Left, frame.Right); c++) {
|
|
@@ -818,7 +820,7 @@ namespace Terminal.Gui {
|
|
}
|
|
}
|
|
|
|
|
|
// Draw the right BorderThickness
|
|
// Draw the right BorderThickness
|
|
- for (int r = Math.Max (Math.Min (frame.Y + borderThickness.Top, frame.Bottom), 0);
|
|
|
|
|
|
+ for (int r = Math.Min (frame.Y + borderThickness.Top, frame.Bottom);
|
|
r < Math.Min (frame.Bottom - borderThickness.Bottom, driver.Rows); r++) {
|
|
r < Math.Min (frame.Bottom - borderThickness.Bottom, driver.Rows); r++) {
|
|
for (int c = Math.Max (frame.Right - borderThickness.Right, frame.X);
|
|
for (int c = Math.Max (frame.Right - borderThickness.Right, frame.X);
|
|
c < Math.Min (frame.Right, driver.Cols); c++) {
|
|
c < Math.Min (frame.Right, driver.Cols); c++) {
|
|
@@ -840,7 +842,7 @@ namespace Terminal.Gui {
|
|
SetBackground (driver);
|
|
SetBackground (driver);
|
|
|
|
|
|
// Draw the upper Padding
|
|
// Draw the upper Padding
|
|
- for (int r = Math.Max (frame.Y + borderThickness.Top, 0);
|
|
|
|
|
|
+ for (int r = frame.Y + borderThickness.Top;
|
|
r < Math.Min (frame.Y + sumThickness.Top, frame.Bottom - borderThickness.Bottom); r++) {
|
|
r < Math.Min (frame.Y + sumThickness.Top, frame.Bottom - borderThickness.Bottom); r++) {
|
|
for (int c = frame.X + borderThickness.Left;
|
|
for (int c = frame.X + borderThickness.Left;
|
|
c < Math.Min (frame.Right - borderThickness.Right, driver.Cols); c++) {
|
|
c < Math.Min (frame.Right - borderThickness.Right, driver.Cols); c++) {
|
|
@@ -850,7 +852,7 @@ namespace Terminal.Gui {
|
|
}
|
|
}
|
|
|
|
|
|
// Draw the left Padding
|
|
// Draw the left Padding
|
|
- for (int r = Math.Max (frame.Y + sumThickness.Top, 0);
|
|
|
|
|
|
+ for (int r = frame.Y + sumThickness.Top;
|
|
r < Math.Min (frame.Bottom - sumThickness.Bottom, driver.Rows); r++) {
|
|
r < Math.Min (frame.Bottom - sumThickness.Bottom, driver.Rows); r++) {
|
|
for (int c = frame.X + borderThickness.Left;
|
|
for (int c = frame.X + borderThickness.Left;
|
|
c < Math.Min (frame.X + sumThickness.Left, frame.Right - borderThickness.Right); c++) {
|
|
c < Math.Min (frame.X + sumThickness.Left, frame.Right - borderThickness.Right); c++) {
|
|
@@ -860,7 +862,7 @@ namespace Terminal.Gui {
|
|
}
|
|
}
|
|
|
|
|
|
// Draw the right Padding
|
|
// Draw the right Padding
|
|
- for (int r = Math.Max (frame.Y + sumThickness.Top, 0);
|
|
|
|
|
|
+ for (int r = frame.Y + sumThickness.Top;
|
|
r < Math.Min (frame.Bottom - sumThickness.Bottom, driver.Rows); r++) {
|
|
r < Math.Min (frame.Bottom - sumThickness.Bottom, driver.Rows); r++) {
|
|
for (int c = Math.Max (frame.Right - sumThickness.Right, frame.X + sumThickness.Left);
|
|
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 < Math.Max (frame.Right - borderThickness.Right, frame.X + sumThickness.Left); c++) {
|