Update UI to use UniverseUGUI 1.6.4-alpha.1

Author: luvoid

ButtJiggle.sln

@@ -5,6 +5,13 @@ VisualStudioVersion = 17.3.32922.545
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ButtJiggle", "ButtJiggle\ButtJiggle.csproj", "{21D55085-3997-4A44-B09B-2B1735CA6D2A}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D7069249-9867-4E11-B365-DA6DE93A9F24}"
+	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
+		LICENSE = LICENSE
+		README.md = README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

ButtJiggle/ButtJiggle.cs

@@ -50,7 +50,7 @@ public static class PluginInfo
 		// The name of this plugin.
 		public const string PLUGIN_NAME = "Butt Jiggle";
 		// The version of this plugin.
-		public const string PLUGIN_VERSION = "0.13";
+		public const string PLUGIN_VERSION = "0.14";
 	}
 }
 

ButtJiggle/ButtJiggle.csproj

@@ -51,8 +51,8 @@
     <PackageReference Include="UniverseLib.Analyzers" Version="1.0.4" targetFramework="net35" developmentDependency="true">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="LuVoid.UniverseUGUI.Mono" Version="1.6.3-preview" targetFramework="net35" />
-    <PackageReference Include="LuVoid.CM3D2.UGUI" Version="0.1.3-preview" targetFramework="net35" />
+    <PackageReference Include="LuVoid.UniverseUGUI.Mono" Version="1.6.4-alpha.1" targetFramework="net35" />
+    <PackageReference Include="LuVoid.CM3D2.UGUI" Version="0.1.4-alpha.1" targetFramework="net35" />
     <PackageReference Include="LuVoid.BepInEx.Configuration.Json" Version="0.5.0-alpha" targetFramework="net35" />
   </ItemGroup>
   <ItemGroup>

ButtJiggle/ButtJiggleUI.cs

@@ -10,6 +10,7 @@
 using COM3D2.ButtJiggle.UI;
 using UniverseLib.UI.Styles;
 using CM3D2.UGUI.Resources;
+using CM3D2.UGUI.Panels;
 
 namespace COM3D2.ButtJiggle
 {
@@ -77,19 +78,18 @@ internal void ToggleUI()
 		}
 	}
 
-	internal class PluginPanel : SkinnedPanelBase
+	internal class PluginPanel : CM3D2Panel
 	{
 		public PluginPanel(UIBase owner) : base(owner) { }
 
 		public override string Name => PluginInfo.PLUGIN_NAME;
-		public override int MinWidth => 400;
-		public override int MinHeight => 500;
+		public override Vector2 PreferredSize => base.PreferredSize + new Vector2(10, 10);
 		public override Vector2 DefaultAnchorMin => new(1f, 0.5f);
 		public override Vector2 DefaultAnchorMax => DefaultAnchorMin;
-		public override Vector2 DefaultPosition => new Vector2(-MinWidth - 50, MinHeight / 2);
+		public override Vector2 DefaultPosition => new Vector2(-PreferredSize.x - 50, PreferredSize.y / 2);
 		public override bool CanDragAndResize => true;
 
-		public override IReadOnlyUISkin Skin => Styles.StandardSkin;
+		private CanvasGroup globalOverrideCanvasGroup;
 
 		protected override void OnClosePanelClicked()
 		{
@@ -115,34 +115,41 @@ protected void SafeConstructPanelContent()
 
 			Create.BoolControl(ContentRoot, "DebugMode", "Debug Mode", refGet: () => ref JiggleBoneHelper.DebugMode);
 
-			var overrideColumn = Create.UIObject(ContentRoot, "Overrides");
-			UIFactory.SetLayoutGroup<VerticalLayoutGroup>(overrideColumn, false, false, true, true); // .CreateVerticalGroup(ContentRoot, "overrides", false, false, true, true, childAlignment: TextAnchor.UpperLeft);
+			var verticalFrame = Create.VerticalFrame(ContentRoot, "Overrides");
+			var overrideColumn = verticalFrame.ContentRoot;
+			//UIFactory.SetLayoutGroup<VerticalLayoutGroup>(overrideColumn, false, false, true, true);
 			UIFactory.SetLayoutElement(overrideColumn, minWidth: 300, minHeight: 300);
 
-			//UIFactory.SetLayoutElement(slotDropdownRoot, minWidth: 300, minHeight: 25, preferredWidth: 300, preferredHeight: 25);
+			Create.BoolControl(overrideColumn, "UseGlobalOverride", "Use Global Override",
+				refGet: () =>
+				{
+					ref var value = ref JiggleBoneHelper.UseGlobalOverride;
+					globalOverrideCanvasGroup.interactable = value;
+					return ref value;
+				},
+				onSet: OnGlobalOverrideUIUpdated,
+				listenForUpdate: ButtJiggle.Instance.OnGlobalOverrideUpdated
+			);
+
+
+			var globalOverrideGroup = Create.VerticalGroup(overrideColumn, "GlobalOverrideCanvasGroup");
+			globalOverrideCanvasGroup = UIFactory.SetCanvasGroup(globalOverrideGroup, interactable: JiggleBoneHelper.UseGlobalOverride);
 			using (Create.LayoutContext(flexibleWidth: 1))
 			{
-				Create.BoolControl(overrideColumn, "UseGlobalOverride", "Use Global Override",
-					refGet: () => ref JiggleBoneHelper.UseGlobalOverride,
-					onSet: OnGlobalOverrideUIUpdated,
-					listenForUpdate: ButtJiggle.Instance.OnGlobalOverrideUpdated
-				);
-
 				List<GameObject> slotColumns = null;
 
-				var slotDropdown = Create.Dropdown(overrideColumn, "SlotSelectDropdown", 
-					(slotIndex) =>
+				var slotDropdown = Create.Dropdown(globalOverrideGroup, "SlotSelectDropdown");
+				slotDropdown.OnValueChanged += (slotIndex) =>
+				{
+					for (int i = 0; i < slotColumns.Count; i++)
 					{
-						for (int i = 0; i < slotColumns.Count; i++)
-						{
-							slotColumns[i].SetActive(i == slotIndex);
-						}
+						slotColumns[i].SetActive(i == slotIndex);
 					}
-				);
+				};
 
 				slotColumns = new List<GameObject>() {
-					CreateJiggleBoneOverrideColumn(overrideColumn, "Hips"  , () => ref JiggleBoneHelper.GlobalOverride.HipOverride   , OnGlobalOverrideUIUpdated, ButtJiggle.Instance.OnGlobalOverrideUpdated),
-					CreateJiggleBoneOverrideColumn(overrideColumn, "Pelvis", () => ref JiggleBoneHelper.GlobalOverride.PelvisOverride, OnGlobalOverrideUIUpdated, ButtJiggle.Instance.OnGlobalOverrideUpdated),
+					CreateJiggleBoneOverrideColumn(globalOverrideGroup, "Hips"  , () => ref JiggleBoneHelper.GlobalOverride.HipOverride   , OnGlobalOverrideUIUpdated, ButtJiggle.Instance.OnGlobalOverrideUpdated),
+					CreateJiggleBoneOverrideColumn(globalOverrideGroup, "Pelvis", () => ref JiggleBoneHelper.GlobalOverride.PelvisOverride, OnGlobalOverrideUIUpdated, ButtJiggle.Instance.OnGlobalOverrideUpdated),
 				};
 
 				int i = 0;
@@ -168,9 +175,7 @@ private GameObject CreateJiggleBoneOverrideColumn(
 			System.Action onSet,
 			UnityEvent listen = null)
 		{
-			//var column = UIFactory.CreateVerticalGroup(parent, name, false, false, true, true, childAlignment: TextAnchor.UpperLeft);
-			var column = Create.UIObject(parent, name);
-			UIFactory.SetLayoutGroup<VerticalLayoutGroup>(column, false, false, true, true); // .CreateVerticalGroup(ContentRoot, "overrides", false, false, true, true, childAlignment: TextAnchor.UpperLeft);
+			var column = Create.VerticalGroup(parent, name);
 			using (Create.LayoutContext(flexibleWidth: 1))
 			{
 				Create.OverrideProperty(column, "Blend Value (auto)", refGet: () => ref refGet().BlendValue      ,  onSet, listen);
@@ -194,6 +199,7 @@ private GameObject CreateJiggleBoneOverrideColumn(
 		private void OnGlobalOverrideUIUpdated()
 		{
 			ButtJiggle.ConfigSaveGlobalOverride();
+			globalOverrideCanvasGroup.interactable = JiggleBoneHelper.UseGlobalOverride;
 		}
 
 		// override other methods as desired

ButtJiggle/UI/UIFactoryExtensions.cs

@@ -2,7 +2,7 @@
 using UnityEngine.Events;
 using UnityEngine;
 using UniverseLib.UI;
-using UniverseLib.UI.Models.Controls;
+using UniverseLib.UI.Controls;
 using UniverseLib.Utility;
 using UnityEngine.UI;
 
@@ -23,50 +23,49 @@ public static GameObject OverrideProperty<T>(this UIFactory create, GameObject p
 			);
 			*/
 
-			var row = create.UIObject(parent, $"Override_{propertyName}".Replace(" ", ""));
-			UIFactory.SetLayoutGroup<HorizontalLayoutGroup>(row, false, false, true, true);
-			using (create.LayoutContext(null))
-			{
-				Property valueProperty = null;
-				void onEnabledSet()
-				{
-					valueProperty.Control.Component.interactable = refGet().Enabled;
-					onSet?.Invoke();
-				}
-				ref bool refEnabledGet()
-				{
-					ref bool enabled = ref refGet().Enabled;
-					valueProperty.Control.Component.interactable = enabled;
-					return ref enabled;
-				}
+			var row = create.HorizontalGroup(parent, $"Override_{propertyName}".Replace(" ", ""));
 
-				BoolControl enabledControl = create.BoolControl(row, $"{propertyName}.{nameof(Override<T>.Enabled)}", refEnabledGet, onEnabledSet, listen);
+			using var _nullContext = create.LayoutContext(null);
 
-				//var dividerLabel = create.Label(row, "Divider", " | ");
+			Property valueProperty = null;
+			void onEnabledSet()
+			{
+				valueProperty.Control.Component.interactable = refGet().Enabled;
+				onSet?.Invoke();
+			}
+			ref bool refEnabledGet()
+			{
+				ref bool enabled = ref refGet().Enabled;
+				valueProperty.Control.Component.interactable = enabled;
+				return ref enabled;
+			}
 
-				if (refGet is RefGetter<Override<string>> refGetOverrideString)
-				{
-					valueProperty = create.StringProperty(row, propertyName, () => ref refGetOverrideString().Value, onSet, listen);
-				}
-				else if (refGet is RefGetter<Override<bool>> refGetOverrideBool)
-				{
-					valueProperty = create.BoolProperty(row, propertyName, () => ref refGetOverrideBool().Value, onSet, listen);
-				}
-				else if (refGet is RefGetter<Override<Stiffness>> refGetOverrideStiffness)
-				{
-					valueProperty = create.ParsedProperty<Stiffness, StiffnessParser>(row, propertyName,
-						() => ref refGetOverrideStiffness().Value,
-						onSet,
-						listen
-					);
-				}
-				else
-				{
-					valueProperty = create.ParsedProperty(row, propertyName, () => ref refGet().Value, onSet, listen);
-				}
+			BoolControl enabledControl = create.BoolControl(row, $"{propertyName}.{nameof(Override<T>.Enabled)}", refEnabledGet, onEnabledSet, listen);
 
-				UIFactory.SetLayoutElement(valueProperty.GameObject, flexibleWidth: 1);
+			//var dividerLabel = create.Label(row, "Divider", " | ");
+
+			if (refGet is RefGetter<Override<string>> refGetOverrideString)
+			{
+				valueProperty = create.StringProperty(row, propertyName, () => ref refGetOverrideString().Value, onSet, listen);
 			}
+			else if (refGet is RefGetter<Override<bool>> refGetOverrideBool)
+			{
+				valueProperty = create.BoolProperty(row, propertyName, () => ref refGetOverrideBool().Value, onSet, listen);
+			}
+			else if (refGet is RefGetter<Override<Stiffness>> refGetOverrideStiffness)
+			{
+				valueProperty = create.ParsedProperty<Stiffness, StiffnessParser>(row, propertyName,
+					() => ref refGetOverrideStiffness().Value,
+					onSet,
+					listen
+				);
+			}
+			else
+			{
+				valueProperty = create.ParsedProperty(row, propertyName, () => ref refGet().Value, onSet, listen);
+			}
+
+			UIFactory.SetLayoutElement(valueProperty.GameObject, flexibleWidth: 1);
 			return row;
 		}
 

README.md

@@ -5,8 +5,8 @@ This plugin is in the early testing stages, but feel free to sneak a peek and [d
 ## Requirements
 * Requires [BepInEx 5.4](https://github.com/BepInEx/BepInEx)
 * Requires [BepInEx.Configuration.Json 0.5.0-alpha](https://github.com/luvoid/BepInEx.Configuration.Json)
-* Requires [UniverseUGUI 1.6.3-preview](https://github.com/luvoid/UniverseUGUI)
-* Requires [CM3D2.UGUI 0.1.3-preview](https://github.com/luvoid/CM3D2.UGUI)
+* Requires [UniverseUGUI 1.6.4-alpha.1](https://github.com/luvoid/UniverseUGUI)
+* Requires [CM3D2.UGUI 0.1.4-alpha.1](https://github.com/luvoid/CM3D2.UGUI)
 * Improved physics with [COM3D2.TimeDependentPhysics.Plugin](https://github.com/luvoid/COM3D2.TimeDependentPhysics.Plugin) (optional)
 
 ## Conflicts