Chassis custom widget settings: Fall back to defaults, though its bas…

…ed on slot count for now.
BattletechModders · Dec 2, 2023 · 424e576 · 424e576
1 parent d917050
commit 424e576
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/source/Features/MechLabSlots/CustomWidgetsFixMechLab.cs b/source/Features/MechLabSlots/CustomWidgetsFixMechLab.cs
@@ -89,8 +89,10 @@ internal static void SetupWidget(string id,
 
         topWidget.Init(mechLabPanel);
 
+        // allow modify layout to go to 0 and
         var layout = new WidgetLayout(topWidget);
         MechLabSlotsFixer.ModifyLayoutSlotCount(layout, settings.Slots);
+
         {
             var mechRectTransform = parent.parent.GetComponent<RectTransform>();
             LayoutRebuilder.ForceRebuildLayoutImmediate(mechRectTransform);
@@ -195,26 +197,27 @@ ref MechComponentRef? cRef
 
     internal static void ShowOrHideCustomWidgets(MechLabLocationWidget widget)
     {
-        if (widget.loadout.Location != ChassisLocations.CenterTorso)
+        if (TopLeftWidget == null || TopRightWidget == null)
         {
+            Log.Main.Warning?.Log("Top widgets not initialized even though they should be");
             return;
         }
 
-        var custom = widget.mechLab.activeMechDef.Chassis.GetComponent<CustomWidgetChassisCustom>();
-        if (custom == null)
+        if (widget.loadout.Location != ChassisLocations.CenterTorso)
         {
             return;
         }
 
-        static void ShowOrHideCustomWidget(MechLabLocationWidget? customWidget, bool? enabled)
+        var custom = widget.mechLab.activeMechDef.Chassis.GetComponent<CustomWidgetChassisCustom>();
+        static void ShowOrHideCustomWidget(
+            MechLabLocationWidget customWidget,
+            bool? enabled,
+            MechLabSlotsSettings.WidgetSettings settings
+        )
         {
-            if (customWidget == null || !enabled.HasValue)
-            {
-                return;
-            }
-            customWidget.gameObject.SetActive(enabled.Value);
+            customWidget.gameObject.SetActive(enabled ?? settings.Enabled);
         }
-        ShowOrHideCustomWidget(TopLeftWidget, custom.TopLeftWidgetEnabled);
-        ShowOrHideCustomWidget(TopRightWidget, custom.TopRightWidgetEnabled);
+        ShowOrHideCustomWidget(TopLeftWidget, custom?.TopLeftWidgetEnabled, MechLabSlotsFeature.settings.TopLeftWidget);
+        ShowOrHideCustomWidget(TopRightWidget, custom?.TopRightWidgetEnabled, MechLabSlotsFeature.settings.TopRightWidget);
     }
 }