From fadecc150ab5811c954bbcef9d0f2ae37588057e Mon Sep 17 00:00:00 2001 From: tznind Date: Sun, 14 Apr 2024 09:41:05 +0100 Subject: [PATCH] Revert "Add ability to disable AutoSize" This reverts commit aa72a97cd677fa818d38ebb01268471479249a3b. --- Terminal.Gui/View/Layout/ViewLayout.cs | 7 ------- Terminal.Gui/Views/Button.cs | 2 +- Terminal.Gui/Views/CheckBox.cs | 2 +- Terminal.Gui/Views/Label.cs | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Terminal.Gui/View/Layout/ViewLayout.cs b/Terminal.Gui/View/Layout/ViewLayout.cs index aed51b327..dcfce1110 100644 --- a/Terminal.Gui/View/Layout/ViewLayout.cs +++ b/Terminal.Gui/View/Layout/ViewLayout.cs @@ -35,13 +35,6 @@ public enum LayoutStyle public partial class View { - /// - /// Determines the default usage of in views - /// that support it (e.g. . Set to false if you frequently - /// get Exceptions about changing Width when AutoSize is true. - /// - public static bool DefaultAutoSize = true; - #region Frame private Rectangle _frame; diff --git a/Terminal.Gui/Views/Button.cs b/Terminal.Gui/Views/Button.cs index 058a25483..a710bc2d9 100644 --- a/Terminal.Gui/Views/Button.cs +++ b/Terminal.Gui/Views/Button.cs @@ -52,7 +52,7 @@ public class Button : View Height = 1; CanFocus = true; - AutoSize = View.DefaultAutoSize; + AutoSize = true; HighlightStyle |= HighlightStyle.Pressed; #if HOVER HighlightStyle |= HighlightStyle.Hover; diff --git a/Terminal.Gui/Views/CheckBox.cs b/Terminal.Gui/Views/CheckBox.cs index d9aa9048f..7b8dc08a8 100644 --- a/Terminal.Gui/Views/CheckBox.cs +++ b/Terminal.Gui/Views/CheckBox.cs @@ -24,7 +24,7 @@ public class CheckBox : View Height = 1; CanFocus = true; - AutoSize = View.DefaultAutoSize; + AutoSize = true; // Things this view knows how to do AddCommand (Command.Accept, OnToggled); diff --git a/Terminal.Gui/Views/Label.cs b/Terminal.Gui/Views/Label.cs index ec62a6802..7b7b331c1 100644 --- a/Terminal.Gui/Views/Label.cs +++ b/Terminal.Gui/Views/Label.cs @@ -16,7 +16,7 @@ public class Label : View public Label () { Height = 1; - AutoSize = View.DefaultAutoSize; + AutoSize = true; // Things this view knows how to do AddCommand (Command.HotKey, FocusNext);