Skip to content

Fixes #2308. Redraw passed bounds bigger than its client area. #2309

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

Merged
tig merged 3 commits into from
Feb 5, 2023
Merged

Fixes #2308. Redraw passed bounds bigger than its client area. #2309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd5655f
Fixes #2308. Redraw passed bounds bigger than its client area.
BDisp Jan 29, 2023
86d3b6d
Locking packed tests to avoid throwing an error.
BDisp Jan 29, 2023
b779199
Added unit test for move down/right.
BDisp Jan 30, 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
31 changes: 19 additions & 12 deletions Terminal.Gui/Core/View.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,14 +446,11 @@ public override bool CanFocus {
public virtual Rect Frame {
get => frame;
set {
if (SuperView != null) {
SuperView.SetNeedsDisplay (frame);
SuperView.SetNeedsDisplay (value);
}
var rect = GetMaxNeedDisplay (frame, value);
frame = new Rect (value.X, value.Y, Math.Max (value.Width, 0), Math.Max (value.Height, 0));
TextFormatter.Size = GetBoundsTextFormatterSize ();
SetNeedsLayout ();
SetNeedsDisplay (frame);
SetNeedsDisplay (rect);
}
}

Expand Down Expand Up @@ -811,6 +808,7 @@ protected virtual void ProcessResizeView ()
{
var actX = x is Pos.PosAbsolute ? x.Anchor (0) : frame.X;
var actY = y is Pos.PosAbsolute ? y.Anchor (0) : frame.Y;
Rect oldFrame = frame;

if (AutoSize) {
var s = GetAutoSize ();
Expand All @@ -825,7 +823,21 @@ protected virtual void ProcessResizeView ()
}
TextFormatter.Size = GetBoundsTextFormatterSize ();
SetNeedsLayout ();
SetNeedsDisplay ();
SetNeedsDisplay (GetMaxNeedDisplay (oldFrame, frame));
}

Rect GetMaxNeedDisplay (Rect oldFrame, Rect newFrame)
{
var rect = new Rect () {
X = Math.Min (oldFrame.X, newFrame.X),
Y = Math.Min (oldFrame.Y, newFrame.Y),
Width = Math.Max (oldFrame.Width, newFrame.Width),
Height = Math.Max (oldFrame.Height, newFrame.Height)
};
rect.Width += Math.Max (oldFrame.X - newFrame.X, 0);
rect.Height += Math.Max (oldFrame.Y - newFrame.Y, 0);

return rect;
}

void TextFormatter_HotKeyChanged (Key obj)
Expand Down Expand Up @@ -1537,12 +1549,7 @@ public virtual void Redraw (Rect bounds)
// Draw the subview
// Use the view's bounds (view-relative; Location will always be (0,0)
if (view.Visible && view.Frame.Width > 0 && view.Frame.Height > 0) {
var rect = new Rect () {
X = Math.Min (view.Bounds.X, view.NeedDisplay.X),
Y = Math.Min (view.Bounds.Y, view.NeedDisplay.Y),
Width = Math.Max (view.Bounds.Width, view.NeedDisplay.Width),
Height = Math.Max (view.Bounds.Height, view.NeedDisplay.Height)
};
var rect = view.Bounds;
view.OnDrawContent (rect);
view.Redraw (rect);
view.OnDrawContentComplete (rect);
Expand Down
Loading