From f08f9c9567291558337cdbaca0c63805fa4fb567 Mon Sep 17 00:00:00 2001 From: Tig Date: Thu, 23 May 2024 07:35:58 -0600 Subject: [PATCH] Fixed FastFlags thing --- Terminal.Gui/View/Adornment/Adornment.cs | 2 +- Terminal.Gui/View/Layout/Dim.cs | 6 +----- Terminal.Gui/View/Layout/DimAuto.cs | 6 +++--- Terminal.Gui/View/Layout/DimAutoStyle.cs | 2 +- Terminal.Gui/View/Layout/ViewLayout.cs | 4 ++-- Terminal.Gui/View/ViewText.cs | 8 ++++---- Terminal.Gui/Views/Dialog.cs | 2 -- Terminal.Gui/Views/TileView.cs | 2 +- 8 files changed, 13 insertions(+), 19 deletions(-) diff --git a/Terminal.Gui/View/Adornment/Adornment.cs b/Terminal.Gui/View/Adornment/Adornment.cs index 611b06d9c..c810310d9 100644 --- a/Terminal.Gui/View/Adornment/Adornment.cs +++ b/Terminal.Gui/View/Adornment/Adornment.cs @@ -242,7 +242,7 @@ public class Adornment : View return base.OnMouseEnter (mouseEvent); } - /// + /// protected internal override bool OnMouseLeave (MouseEvent mouseEvent) { // Invert Normal diff --git a/Terminal.Gui/View/Layout/Dim.cs b/Terminal.Gui/View/Layout/Dim.cs index 79c2e6db0..1fc16c9c2 100644 --- a/Terminal.Gui/View/Layout/Dim.cs +++ b/Terminal.Gui/View/Layout/Dim.cs @@ -150,11 +150,7 @@ public abstract class Dim /// Creates a percentage object that is a percentage of the width or height of the SuperView. /// The percent object. /// A value between 0 and 100 representing the percentage. - /// - /// If the dimension is computed using the View's position ( or - /// ). - /// If the dimension is computed using the View's . - /// + /// /// /// This initializes a that will be centered horizontally, is 50% of the way down, is 30% the /// height, diff --git a/Terminal.Gui/View/Layout/DimAuto.cs b/Terminal.Gui/View/Layout/DimAuto.cs index 6a569b01c..b8dc4204f 100644 --- a/Terminal.Gui/View/Layout/DimAuto.cs +++ b/Terminal.Gui/View/Layout/DimAuto.cs @@ -60,13 +60,13 @@ public class DimAuto () : Dim var subviewsSize = 0; int autoMin = MinimumContentDim?.GetAnchor (superviewContentSize) ?? 0; - - if (Style.HasFlag (DimAutoStyle.Text)) + + if (Style.FastHasFlags (DimAutoStyle.Text)) { textSize = int.Max (autoMin, dimension == Dimension.Width ? us.TextFormatter.Size.Width : us.TextFormatter.Size.Height); } - if (Style.HasFlag (DimAutoStyle.Content)) + if (Style.FastHasFlags (DimAutoStyle.Content)) { if (us._contentSize is { }) { diff --git a/Terminal.Gui/View/Layout/DimAutoStyle.cs b/Terminal.Gui/View/Layout/DimAutoStyle.cs index fe0eeed81..85b162569 100644 --- a/Terminal.Gui/View/Layout/DimAutoStyle.cs +++ b/Terminal.Gui/View/Layout/DimAutoStyle.cs @@ -5,8 +5,8 @@ namespace Terminal.Gui; /// /// Specifies how will compute the dimension. /// -[GenerateEnumExtensionMethods] [Flags] +[GenerateEnumExtensionMethods (FastHasFlags = true)] public enum DimAutoStyle { /// diff --git a/Terminal.Gui/View/Layout/ViewLayout.cs b/Terminal.Gui/View/Layout/ViewLayout.cs index dcb94b91e..94348fc75 100644 --- a/Terminal.Gui/View/Layout/ViewLayout.cs +++ b/Terminal.Gui/View/Layout/ViewLayout.cs @@ -1049,13 +1049,13 @@ public partial class View // Verify none of the subviews are using Dim objects that depend on the SuperView's dimensions. foreach (View view in Subviews) { - if (widthAuto is { } && widthAuto.Style.HasFlag (DimAutoStyle.Content) && _contentSize is null) + if (widthAuto is { } && widthAuto.Style.FastHasFlags (DimAutoStyle.Content) && _contentSize is null) { ThrowInvalid (view, view.Width, nameof (view.Width)); ThrowInvalid (view, view.X, nameof (view.X)); } - if (heightAuto is { } && heightAuto.Style.HasFlag (DimAutoStyle.Content) && _contentSize is null) + if (heightAuto is { } && heightAuto.Style.FastHasFlags (DimAutoStyle.Content) && _contentSize is null) { ThrowInvalid (view, view.Height, nameof (view.Height)); ThrowInvalid (view, view.Y, nameof (view.Y)); diff --git a/Terminal.Gui/View/ViewText.cs b/Terminal.Gui/View/ViewText.cs index db526f67c..2ee3a51a0 100644 --- a/Terminal.Gui/View/ViewText.cs +++ b/Terminal.Gui/View/ViewText.cs @@ -186,17 +186,17 @@ public partial class View // Use _width & _height instead of Width & Height to avoid debug spew DimAuto widthAuto = _width as DimAuto; DimAuto heightAuto = _height as DimAuto; - if ((widthAuto is { } && widthAuto.Style.HasFlag (DimAutoStyle.Text)) - || (heightAuto is { } && heightAuto.Style.HasFlag (DimAutoStyle.Text))) + if ((widthAuto is { } && widthAuto.Style.FastHasFlags (DimAutoStyle.Text)) + || (heightAuto is { } && heightAuto.Style.FastHasFlags (DimAutoStyle.Text))) { size = TextFormatter.GetAutoSize (); - if (widthAuto is null || !widthAuto.Style.HasFlag (DimAutoStyle.Text)) + if (widthAuto is null || !widthAuto.Style.FastHasFlags (DimAutoStyle.Text)) { size.Width = ContentSize.Width; } - if (heightAuto is null || !heightAuto.Style.HasFlag (DimAutoStyle.Text)) + if (heightAuto is null || !heightAuto.Style.FastHasFlags (DimAutoStyle.Text)) { size.Height = ContentSize.Height; } diff --git a/Terminal.Gui/Views/Dialog.cs b/Terminal.Gui/Views/Dialog.cs index 96cc41f1b..9a964d86c 100644 --- a/Terminal.Gui/Views/Dialog.cs +++ b/Terminal.Gui/Views/Dialog.cs @@ -43,8 +43,6 @@ public class Dialog : Window //}; private readonly List