Fixed nested SettingCollections not showing when loaded from settings…

….json. Improved spacing at the bottom of each SettingsView panel.
sliekens · Jan 24, 2021 · 9046377 · 9046377
1 parent 5e8dd7e
commit 9046377
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 13 deletions.
diff --git a/.idea/.idea.Blish HUD/.idea/modules.xml b/.idea/.idea.Blish HUD/.idea/modules.xml
diff --git a/Blish HUD/Controls/Container.cs b/Blish HUD/Controls/Container.cs
@@ -105,6 +105,18 @@ public virtual SizingMode HeightSizingMode {
             get => _heightSizingMode;
             set => SetProperty(ref _heightSizingMode, value);
         }
+
+        private Point _autoSizePadding = Point.Zero;
+
+        /// <summary>
+        /// If <see cref="HeightSizingMode"/> or <see cref="WidthSizingMode"/> is set to
+        /// <see cref="SizingMode.AutoSize"/>, then <see cref="AutoSizePadding"/> is
+        /// added to the size.
+        /// </summary>
+        public Point AutoSizePadding {
+            get => _autoSizePadding;
+            set => SetProperty(ref _autoSizePadding, value);
+        }
 
         public List<Control> GetDescendants() {
             var allDescendants = _children.ToList();
@@ -211,11 +223,11 @@ public sealed override void DoUpdate(GameTime gameTime) {
             if (this.Parent != null) { 
                 this.Size = new Point(GetUpdatedSizing(this.WidthSizingMode,
                                                       this.Width,
-                                                      _contentBounds.X + (this.Width - this.ContentRegion.Width),
+                                                      _contentBounds.X                            + (this.Width - this.ContentRegion.Width) + _autoSizePadding.X,
                                                       this.Parent.ContentRegion.Width - this.Left),
                                       GetUpdatedSizing(this.HeightSizingMode,
                                                       this.Height,
-                                                      _contentBounds.Y + (this.Height - this.ContentRegion.Height),
+                                                      _contentBounds.Y                 + (this.Height - this.ContentRegion.Height) + _autoSizePadding.Y,
                                                       this.Parent.ContentRegion.Height - this.Top));
             }
 

diff --git a/Blish HUD/GameServices/Settings/SettingCollection.cs b/Blish HUD/GameServices/Settings/SettingCollection.cs
@@ -11,11 +11,19 @@ public sealed class SettingCollection : IEnumerable<SettingEntry> {
 
         public class SettingCollectionConverter : JsonConverter<SettingCollection> {
 
+            private const string ATTR_LAZY       = "Lazy";
+            private const string ATTR_RENDERINUI = "Ui";
+            private const string ATTR_ENTRIES    = "Entries";
+
             public override void WriteJson(JsonWriter writer, SettingCollection value, JsonSerializer serializer) {
                 var settingCollectionObject = new JObject();
 
                 if (value.LazyLoaded) {
-                    settingCollectionObject.Add("Lazy", value.LazyLoaded);
+                    settingCollectionObject.Add(ATTR_LAZY, value.LazyLoaded);
+                }
+
+                if (value.RenderInUi) {
+                    settingCollectionObject.Add(ATTR_RENDERINUI, value.RenderInUi);
                 }
 
                 var entryArray = value._entryTokens as JArray;
@@ -27,27 +35,30 @@ public override void WriteJson(JsonWriter writer, SettingCollection value, JsonS
                     }
                 }
 
-                settingCollectionObject.Add("Entries", entryArray);
+                settingCollectionObject.Add(ATTR_ENTRIES, entryArray);
 
                 settingCollectionObject.WriteTo(writer);
             }
 
             public override SettingCollection ReadJson(JsonReader reader, Type objectType, SettingCollection existingValue, bool hasExistingValue, JsonSerializer serializer) {
                 if (reader.TokenType == JsonToken.Null) return null;
 
-                JObject jObj = JObject.Load(reader);
+                var jObj = JObject.Load(reader);
 
-                var isLazy = false;
+                bool isLazy     = false;
+                bool renderInUi = false;
 
-                if (jObj["Lazy"] != null) {
-                    isLazy = jObj["Lazy"].Value<bool>();
+                if (jObj[ATTR_LAZY] != null) {
+                    isLazy = jObj[ATTR_LAZY].Value<bool>();
                 }
 
-                if (jObj["Entries"] != null) {
-                    return new SettingCollection(isLazy, jObj["Entries"]);
+                if (jObj[ATTR_RENDERINUI] != null) {
+                    renderInUi = jObj[ATTR_RENDERINUI].Value<bool>();
                 }
 
-                return new SettingCollection(isLazy);
+                return jObj[ATTR_ENTRIES] != null
+                           ? new SettingCollection(isLazy, jObj[ATTR_ENTRIES]) { RenderInUi = renderInUi }
+                           : new SettingCollection(isLazy) { RenderInUi = renderInUi };
             }
 
         }

diff --git a/Blish HUD/GameServices/Settings/UI/Views/SettingsView.cs b/Blish HUD/GameServices/Settings/UI/Views/SettingsView.cs
@@ -44,10 +44,11 @@ protected override void BuildSetting(Panel buildPanel) {
             _settingFlowPanel = new FlowPanel() {
                 Size                = buildPanel.Size,
                 FlowDirection       = ControlFlowDirection.SingleTopToBottom,
-                ControlPadding      = new Vector2(5, 2),
+                ControlPadding      = new Vector2(5,  2),
                 OuterControlPadding = new Vector2(10, 15),
                 WidthSizingMode     = SizingMode.Fill,
                 HeightSizingMode    = SizingMode.AutoSize,
+                AutoSizePadding     = new Point(0, 15),
                 Parent              = buildPanel
             };