Shorter plugin name; fixed chara/coord load toggles not being aligned…

… properly
IllusionMods · May 1, 2019 · c2b80e3 · c2b80e3
1 parent 7355eda
commit c2b80e3
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 22 deletions.
diff --git a/API/Maker/UI/BaseGuiEntry.cs b/API/Maker/UI/BaseGuiEntry.cs
@@ -60,6 +60,9 @@ protected internal static Transform GuiCacheTransfrom
             }
         }
 
+        /// <summary>
+        /// Find first control of this name under the specified category transform
+        /// </summary>
         protected static Transform GetExistingControl(string categoryPath, string controlName)
         {
             var cat = GameObject.Find(categoryPath);

diff --git a/API/Maker/UI/MakerCoordinateLoadToggle.cs b/API/Maker/UI/MakerCoordinateLoadToggle.cs
@@ -55,7 +55,7 @@ internal static void CreateCustomToggles()
             for (var index = 0; index < _baseToggles.Count; index++)
             {
                 var baseToggle = _baseToggles[index];
-                baseToggle.localPosition = new Vector3(-380 + singleWidth * index, 52, 0);
+                baseToggle.localPosition = new Vector3(_baseToggle.localPosition.x + singleWidth * index, 52, 0);
                 baseToggle.offsetMax = new Vector2(baseToggle.offsetMin.x + singleWidth, baseToggle.offsetMin.y + 26);
             }
         }
@@ -78,7 +78,7 @@ protected override GameObject OnCreateControl(Transform loadBoxTransform)
             var singleWidth = TotalWidth / (_baseToggles.Count + Toggles.Count);
 
             var rt = copy.GetComponent<RectTransform>();
-            rt.localPosition = new Vector3(-380 + singleWidth * _createdCount, 52, 0);
+            rt.localPosition = new Vector3(_baseToggle.localPosition.x + singleWidth * _createdCount, 52, 0);
             rt.offsetMax = new Vector2(rt.offsetMin.x + singleWidth, rt.offsetMin.y + 26);
 
             copy.gameObject.SetActive(true);
@@ -110,15 +110,19 @@ internal static void Setup()
             Reset();
 
             _root = GetRootObject();
+            var allChildren = _root.transform.Cast<Transform>().Select(x => x.GetComponent<RectTransform>()).ToList();
 
-            _baseToggles = _root.transform.Cast<Transform>()
-                .Where(x => x.name.StartsWith("tglItem0"))
-                .Select(x => x.GetComponent<RectTransform>())
+            _baseToggles = allChildren
+                .Where(x => x.name.StartsWith("tglItem"))
                 .ToList();
-
             _createdCount = _baseToggles.Count;
-            
+
             _baseToggle = _root.transform.Find("tglItem01");
+
+#if EC
+            // Disable the text since there's no space
+            allChildren.FirstOrDefault(x => x.name.StartsWith("Text"))?.gameObject.SetActive(false);
+#endif
 
             /*var allon = _root.transform.Find("btnAllOn");
             allon.GetComponentInChildren<Button>().onClick.AddListener(OnAllOn);

diff --git a/API/Maker/UI/MakerLoadToggle.cs b/API/Maker/UI/MakerLoadToggle.cs
@@ -69,7 +69,7 @@ protected override GameObject OnCreateControl(Transform loadBoxTransform)
             var singleItemWidth = TotalWidth / Toggles.Count;
 
             var rt = copy.GetComponent<RectTransform>();
-            rt.localPosition = new Vector3(-380 + singleItemWidth * _createdCount, 26);
+            rt.localPosition = new Vector3(_baseToggle.localPosition.x + singleItemWidth * _createdCount, 26);
             rt.offsetMax = new Vector2(rt.offsetMin.x + singleItemWidth, rt.offsetMin.y + 26);
 
             copy.gameObject.SetActive(true);
@@ -101,21 +101,22 @@ internal static void Setup()
             Reset();
 
             _root = GetRootObject();
-            var baseToggles = _root.transform.Cast<Transform>()
+            var allChildren = _root.transform.Cast<Transform>().Select(x => x.GetComponent<RectTransform>()).ToList();
+
+            var baseToggles = allChildren
                 .Where(x => x.name.StartsWith("tglItem"))
-                .Select(x => x.GetComponent<RectTransform>())
                 .ToList();
 
+            _baseToggle = _root.transform.Find("tglItem01");
+
             var singleWidth = TotalWidth / baseToggles.Count;
             for (var index = 0; index < baseToggles.Count; index++)
             {
                 var baseToggle = baseToggles[index];
-                baseToggle.localPosition = new Vector3(-380 + singleWidth * index, 52, 0);
+                baseToggle.localPosition = new Vector3(_baseToggle.localPosition.x + singleWidth * index, 52, 0);
                 baseToggle.offsetMax = new Vector2(baseToggle.offsetMin.x + singleWidth, baseToggle.offsetMin.y + 26);
             }
 
-            _baseToggle = _root.transform.Find("tglItem01");
-
             var allon = _root.transform.Find("btnAllOn");
             allon.GetComponentInChildren<Button>().onClick.AddListener(OnAllOn);
             var alloff = _root.transform.Find("btnAllOff");

diff --git a/ECAPI/KoikatuAPI.cs b/ECAPI/KoikatuAPI.cs
@@ -16,7 +16,7 @@ namespace KKAPI
     /// like synchronization of threads or checking if required plugins are installed.
     /// More information is available in project wiki at https://github.com/ManlyMarco/KKAPI/wiki
     /// </summary>
-    [BepInPlugin(GUID, "Modding API for Emotion Creators!", VersionConst)]
+    [BepInPlugin(GUID, "Modding API", VersionConst)]
     public class KoikatuAPI : BaseUnityPlugin
     {
         /// <summary>

diff --git a/ECAPI/Properties/AssemblyInfo.cs b/ECAPI/Properties/AssemblyInfo.cs
@@ -7,12 +7,9 @@
 // associated with an assembly.
 [assembly: AssemblyTitle("ECAPI")]
 [assembly: AssemblyDescription("Modding API for EmotionCreators!")]
-[assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ManlyMarco")]
 [assembly: AssemblyProduct("ECAPI")]
 [assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from

diff --git a/KKAPI/KoikatuAPI.cs b/KKAPI/KoikatuAPI.cs
@@ -19,7 +19,7 @@ namespace KKAPI
     /// like synchronization of threads or checking if required plugins are installed.
     /// More information is available in project wiki at https://github.com/ManlyMarco/KKAPI/wiki
     /// </summary>
-    [BepInPlugin(GUID, "Modding API for Koikatsu!", VersionConst)]
+    [BepInPlugin(GUID, "Modding API", VersionConst)]
     public class KoikatuAPI : BaseUnityPlugin
     {
         /// <summary>

diff --git a/KKAPI/Properties/AssemblyInfo.cs b/KKAPI/Properties/AssemblyInfo.cs
@@ -7,12 +7,9 @@
 // associated with an assembly.
 [assembly: AssemblyTitle("KKAPI")]
 [assembly: AssemblyDescription("Modding API for Koikatsu!")]
-[assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ManlyMarco")]
 [assembly: AssemblyProduct("KKAPI")]
 [assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
 // to COM components.  If you need to access a type in this assembly from

diff --git a/doc/KKAPI.Maker.UI.md b/doc/KKAPI.Maker.UI.md
@@ -77,7 +77,7 @@ Static Methods
 
 | Type | Name | Summary | 
 | --- | --- | --- | 
-| `Transform` | GetExistingControl(`String` categoryPath, `String` controlName) |  | 
+| `Transform` | GetExistingControl(`String` categoryPath, `String` controlName) | Find first control of this name under the specified category transform | 
 
 
 ## `MakerButton`