Skip to content

Commit 4db311f

Browse files
Clear out old text controls, no longer valid. Update combobox scripts
1 parent 7da6948 commit 4db311f

19 files changed

+15
-844
lines changed

Runtime/Scripts/Controls/ComboBox/AutoCompleteComboBox.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class AutoCompleteComboBox : MonoBehaviour
2929
private bool _isPanelActive = false;
3030
private bool _hasDrawnOnce = false;
3131

32-
private InputField _mainInput;
32+
private TMPro.TMP_InputField _mainInput;
3333
private RectTransform _inputRT;
3434

3535
private RectTransform _rectTransform;
@@ -171,8 +171,8 @@ private bool Initialize()
171171
try
172172
{
173173
_rectTransform = GetComponent<RectTransform>();
174-
_inputRT = _rectTransform.Find("InputField").GetComponent<RectTransform>();
175-
_mainInput = _inputRT.GetComponent<InputField>();
174+
_mainInput = GetComponentInChildren<TMPro.TMP_InputField>();
175+
_inputRT = _mainInput.GetComponent<RectTransform>();
176176

177177
_overlayRT = _rectTransform.Find("Overlay").GetComponent<RectTransform>();
178178
_overlayRT.gameObject.SetActive(false);

Runtime/Scripts/Controls/ComboBox/ComboBox.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class ControlDisabledEvent : Events.UnityEvent<bool> { }
5454
//private bool isInitialized = false;
5555
private bool _isPanelActive = false;
5656
private bool _hasDrawnOnce = false;
57-
private InputField _mainInput;
57+
private TMPro.TMP_InputField _mainInput;
5858
private RectTransform _inputRT;
5959
private RectTransform _rectTransform;
6060
private RectTransform _overlayRT;
@@ -115,8 +115,8 @@ private bool Initialize()
115115
try
116116
{
117117
_rectTransform = GetComponent<RectTransform>();
118-
_inputRT = _rectTransform.Find("InputField").GetComponent<RectTransform>();
119-
_mainInput = _inputRT.GetComponent<InputField>();
118+
_mainInput = GetComponentInChildren<TMPro.TMP_InputField>();
119+
_inputRT = _mainInput.GetComponent<RectTransform>();
120120

121121
_overlayRT = _rectTransform.Find("Overlay").GetComponent<RectTransform>();
122122
_overlayRT.gameObject.SetActive(false);

Runtime/Scripts/Effects/BestFitOutline.cs

Lines changed: 0 additions & 65 deletions
This file was deleted.

Runtime/Scripts/Effects/BestFitOutline.cs.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Runtime/Scripts/Effects/CurvedText.cs

Lines changed: 0 additions & 83 deletions
This file was deleted.

Runtime/Scripts/Effects/CurvedText.cs.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Runtime/Scripts/Effects/CylinderText.cs

Lines changed: 0 additions & 57 deletions
This file was deleted.

Runtime/Scripts/Effects/CylinderText.cs.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)