Fixed rich text in toggles and buttons having the community labs icon.

RequiDev · Aug 21, 2021 · b33bcce · b33bcce
1 parent 104e7c7
commit b33bcce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/ReModCE/Components/ButtonAdjustmentsComponent.cs b/ReModCE/Components/ButtonAdjustmentsComponent.cs
@@ -53,8 +53,8 @@ public override void OnUiManagerInit(UiManager uiManager)
                 CreateUiForButton(button.gameObject, text.text);
             }
 
-            CreateUiForButton(ExtendedQuickMenu.UserIconCameraButton.gameObject, "Camera Icon Button", size: false);
-            CreateUiForButton(ExtendedQuickMenu.VRCPlusPet.gameObject, "VRC+ Pet", false, size: false);
+            CreateUiForButton(ExtendedQuickMenu.UserIconCameraButton.gameObject, "Camera Icon Button", disable:false, size: false); // 
+            CreateUiForButton(ExtendedQuickMenu.VRCPlusPet.gameObject, "VRC+ Pet", false, disable: false, size: false);
         }
 
         private void CreateUiForButton(GameObject gameObject, string name, bool hasButton = true, bool disable = true, bool move = true, bool size = true)

diff --git a/ReModCE/UI/ReQuickButton.cs b/ReModCE/UI/ReQuickButton.cs
@@ -32,7 +32,7 @@ public bool Interactable
 
         public ReQuickButton(Vector2 pos, string text, string tooltip, Action onClick, Transform parent = null) : base(ExtendedQuickMenu.ReportWorldButton.gameObject, parent, pos, $"{text}Button")
         {
-            Object.DestroyImmediate(RectTransform.Find("CLIcon"));
+            Object.DestroyImmediate(RectTransform.Find("CLIcon").gameObject);
 
             _textComponent = GameObject.GetComponentInChildren<Text>();
             _textComponent.resizeTextForBestFit = true;

diff --git a/ReModCE/UI/ReQuickToggle.cs b/ReModCE/UI/ReQuickToggle.cs
@@ -32,13 +32,17 @@ public ReQuickToggle(Vector2 pos, string text, string tooltip, Action<bool> onTo
 
             _toggleStateOn.GetComponentsInChildren<Text>()[0].text = $"{text}\nON";
             _toggleStateOn.GetComponentsInChildren<Text>()[0].resizeTextForBestFit = true;
+            _toggleStateOn.GetComponentsInChildren<Text>()[0].supportRichText = true;
             _toggleStateOff.GetComponentsInChildren<Text>()[0].text = $"{text}\nON";
             _toggleStateOff.GetComponentsInChildren<Text>()[0].resizeTextForBestFit = true;
+            _toggleStateOff.GetComponentsInChildren<Text>()[0].supportRichText = true;
 
             _toggleStateOn.GetComponentsInChildren<Text>()[1].text = $"{text}\nOFF";
             _toggleStateOn.GetComponentsInChildren<Text>()[1].resizeTextForBestFit = true;
+            _toggleStateOn.GetComponentsInChildren<Text>()[1].supportRichText = true;
             _toggleStateOff.GetComponentsInChildren<Text>()[1].text = $"{text}\nOFF";
             _toggleStateOff.GetComponentsInChildren<Text>()[1].resizeTextForBestFit = true;
+            _toggleStateOff.GetComponentsInChildren<Text>()[1].supportRichText = true;
 
             _buttonComponent = GameObject.GetComponent<Button>();
             _buttonComponent.onClick = new Button.ButtonClickedEvent();