Merge pull request #57 from ZehsTeam/main

Fixes to the color picker menu

Author: AinaVT

Assets/LethalConfigManifest.asset

@@ -70,7 +70,7 @@ MonoBehaviour:
   Name: LethalConfig
   Description: Provides an in-game config menu for players to edit their configs,
     and an API for other mods to use and customize their entries.
-  Version: 1.4.5
+  Version: 1.4.6
   Dependencies:
   - {fileID: 11400000, guid: 93f32f19b4b23484b83d50013fee18e8, type: 2}
 --- !u!114 &4587465158208312100

Assets/Prefabs/ConfigMenuColorPicker.prefab

@@ -1590,7 +1590,7 @@ MonoBehaviour:
   m_fontSizeMax: 72
   m_fontStyle: 0
   m_HorizontalAlignment: 1
-  m_VerticalAlignment: 512
+  m_VerticalAlignment: 256
   m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
@@ -1639,7 +1639,7 @@ MonoBehaviour:
   m_IgnoreLayout: 0
   m_MinWidth: -1
   m_MinHeight: -1
-  m_PreferredWidth: -1
+  m_PreferredWidth: 241
   m_PreferredHeight: -1
   m_FlexibleWidth: -1
   m_FlexibleHeight: 0

Assets/Scripts/LethalConfigPlugin.cs

@@ -8,7 +8,7 @@ public static class PluginInfo
     {
         public const string Guid = "ainavt.lc.lethalconfig";
         public const string Name = "LethalConfig";
-        public const string Version = "1.4.5";
+        public const string Version = "1.4.6";
     }
 
     [BepInPlugin(PluginInfo.Guid, PluginInfo.Name, PluginInfo.Version)]

Assets/Scripts/MonoBehaviours/ColorPicker/ColorPickerControl.cs

@@ -46,13 +46,13 @@ private void Initialize()
 
         private void CreateHueImage()
         {
-            _hueTexture = new Texture2D(1, 16);
+            _hueTexture = new Texture2D(1, 16, TextureFormat.RGBA32, false);
             _hueTexture.wrapMode = TextureWrapMode.Clamp;
             _hueTexture.name = "HueTexture";
 
             for (int i = 0; i < _hueTexture.height; i++)
             {
-                _hueTexture.SetPixel(0, i, Color.HSVToRGB(i / (float)_hueTexture.height, 1, 0.95f));
+                _hueTexture.SetPixel(0, i, Color.HSVToRGB(i / (float)_hueTexture.height, 1f, 1f));
             }
 
             _hueTexture.Apply();
@@ -63,7 +63,7 @@ private void CreateHueImage()
 
         private void CreateSatValImage()
         {
-            _satValTexture = new Texture2D(16, 16);
+            _satValTexture = new Texture2D(16, 16, TextureFormat.RGBA32, false);
             _satValTexture.wrapMode = TextureWrapMode.Clamp;
             _satValTexture.name = "SatValTexture";
 
@@ -84,7 +84,7 @@ private void CreateSatValImage()
 
         private void CreatePreviousOutputImage()
         {
-            _previousOutputTexture = new Texture2D(1, 16);
+            _previousOutputTexture = new Texture2D(1, 16, TextureFormat.RGBA32, false);
             _previousOutputTexture.wrapMode = TextureWrapMode.Clamp;
             _previousOutputTexture.name = "PreviousOutputTexture";
 
@@ -101,7 +101,7 @@ private void CreatePreviousOutputImage()
 
         private void CreateCurrentOutputImage()
         {
-            _currentOutputTexture = new Texture2D(1, 16);
+            _currentOutputTexture = new Texture2D(1, 16, TextureFormat.RGBA32, false);
             _currentOutputTexture.wrapMode = TextureWrapMode.Clamp;
             _currentOutputTexture.name = "CurrentOutputTexture";
 

Assets/Scripts/MonoBehaviours/ColorPicker/SVImageControl.cs

@@ -1,5 +1,4 @@
-using LethalConfig.Utils;
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
@@ -25,6 +24,16 @@ private void Awake()
 
         private void UpdateColor(PointerEventData eventData)
         {
+            if (_rectTransform == null)
+            {
+                _rectTransform = GetComponent<RectTransform>();
+            }
+
+            if (_pickerTransform == null)
+            {
+                _pickerTransform = _pickerImage.GetComponent<RectTransform>();
+            }
+
             RectTransformUtility.ScreenPointToLocalPointInRectangle(_rectTransform, eventData.position, eventData.pressEventCamera, out Vector2 localPosition);
 
             Vector2 clampedPosition = new Vector2(
@@ -54,6 +63,16 @@ public void OnPointerClick(PointerEventData eventData)
 
         public void SetPickerLocation(float saturation, float value)
         {
+            if (_rectTransform == null)
+            {
+                _rectTransform = GetComponent<RectTransform>();
+            }
+
+            if (_pickerTransform == null)
+            {
+                _pickerTransform = _pickerImage.GetComponent<RectTransform>();
+            }
+
             float x = (saturation * _rectTransform.rect.width) - (_rectTransform.rect.width * 0.5f);
             float y = (value * _rectTransform.rect.height) - (_rectTransform.rect.height * 0.5f);
 

CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.4.6
+- Fixed the color picker menu not working in the lobby. (#57)
+- Fixed long config item names stretching the color picker menu. (#57)
+
 ## Version 1.4.5
 - Added new `HexColorInputFieldConfigItem` for hex color code strings with previews. (#56)
 - Fixed the config search bar showing sections that were hidden using the "show/hide" button when updating the search value. (#56)