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

Comments and some cleanup

Browse Source
This commit is contained in:
Tig Kindel
2023-02-22 08:27:35 +13:00
parent 4bbd359745
commit b2865d2c40
2 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Terminal.Gui/Core/Container.cs
View File

@@ -20,22 +20,16 @@ namespace Terminal.Gui {
}
foreach (var view in Subviews) {
if (!view.NeedDisplay.IsEmpty || view.ChildNeedsDisplay || view.LayoutNeeded) {
if (true) {//) && (view.Frame.IntersectsWith (boundsAdjustedForBorder) || boundsAdjustedForBorder.X < 0 || bounds.Y < 0)) {
if (view.LayoutNeeded) {
view.LayoutSubviews ();
}
// BUGBUG: v2 - shouldn't this be !view.LayoutNeeded? Why draw if layout is going to happen and we'll just draw again?
if (view.LayoutNeeded) {
view.LayoutSubviews ();
}
if ((view.Visible && !view.NeedDisplay.IsEmpty && view.Frame.Width > 0 && view.Frame.Height > 0) || view.ChildNeedsDisplay) {
view.Redraw (view.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 = view.Bounds;
//view.OnDrawContent (rect);
view.Redraw (rect);
//view.OnDrawContentComplete (rect);
}
}
view.NeedDisplay = Rect.Empty;
// BUGBUG - v2 why does this need to be set to false?
// Shouldn't it be set when the subviews draw?
view.ChildNeedsDisplay = false;
}
}
@@ -50,18 +44,12 @@ namespace Terminal.Gui {
// Draw any Text
if (TextFormatter != null) {
TextFormatter.NeedsFormat = true;
Rect containerBounds = GetContainerBounds ();
TextFormatter?.Draw (ViewToScreen (viewport), HasFocus ? ColorScheme.Focus : GetNormalColor (),
HasFocus ? ColorScheme.HotFocus : Enabled ? ColorScheme.HotNormal : ColorScheme.Disabled,
containerBounds);
}
Rect containerBounds = GetContainerBounds ();
TextFormatter?.Draw (ViewToScreen (viewport), HasFocus ? ColorScheme.Focus : GetNormalColor (),
HasFocus ? ColorScheme.HotFocus : Enabled ? ColorScheme.HotNormal : ColorScheme.Disabled,
containerBounds);
}
//base.OnDrawContent (viewport);
}
public override void OnDrawContentComplete (Rect viewport)
{
//base.OnDrawContentComplete (viewport);
}
public override void Redraw (Rect bounds)
@@ -81,28 +69,34 @@ namespace Terminal.Gui {
}
/// <summary>
/// A <see cref="Container"/> used for the rectangles that compose the outer frames of a <see cref="View"/>.
/// </summary>
public class Frame : Container {
public Label DiagnosticsLabel { get; set; }
//public Label DiagnosticsLabel { get; set; }
// TODO: v2 = This is teporary; need to also enable (or not) simple way of setting
// other border properties
// TOOD: v2 - Missing 3D effect
public BorderStyle BorderStyle { get; set; } = BorderStyle.None;
public Frame () => IgnoreBorderPropertyOnRedraw = true;
public Thickness Thickness { get; set; }
// TODO: v2 - This is confusing. It is a read-only property and actually only returns a size, so
// should not be a Rect. However, it may make sense to keep it a Rect and support negative Location
// for scrolling. Still noodling this.
/// <summary>
/// Gets the rectangle that describes the inner area of the frame. The Location is always 0, 0.
/// </summary>
public new Rect Bounds {
get {
if (Thickness != null) {
new Rect (Point.Empty, Frame.Size);
}
var frameRelativeBounds = Thickness.GetInnerRect (new Rect (Point.Empty, Frame.Size));
return frameRelativeBounds;
// Return the frame-relative bounds
return Thickness.GetInnerRect (new Rect (Point.Empty, Frame.Size));
}
set {
throw new InvalidOperationException ("It makes no sense to explicitly set Bounds.");
//Frame = new Rect (Frame.Location, value.Size
// + new Size (Margin.Thickness.Right, Margin.Thickness.Bottom)
// + new Size (BorderFrame.Thickness.Right, BorderFrame.Thickness.Bottom)
// + new Size (BorderFrame.Thickness.Right, BorderFrame.Thickness.Bottom));
}
}

4
Terminal.Gui/Core/View.cs
View File

@@ -963,6 +963,8 @@ namespace Terminal.Gui {
}
}
// BUGBUG: v2 - this is poorly named. First, is this reallly just about Children or
// both subviews and children? And why "Display"? It should be "Redraw".
internal bool ChildNeedsDisplay { get; set; }
/// <summary>
@@ -975,6 +977,7 @@ namespace Terminal.Gui {
container.SetChildNeedsDisplay ();
}
// BUGBUG: v2 - this feels like a hack
internal bool addingView;
/// <summary>
@@ -1152,6 +1155,7 @@ namespace Terminal.Gui {
});
}
// TODO: v2 - remove duplicate code here
/// <summary>
/// Clears the view region with the current color.
/// </summary>