Fix TextMeshPro warnings

Author: Pauliusd01

Assets/QA/Tests/Core Platform Menu/ReturnToMenuOverlay.cs

@@ -28,6 +28,7 @@ public class ReturnToMenuOverlay : MonoBehaviour
     InputAction m_BackAction;
     GameObject m_ConfirmPanel;
     GameObject m_ReturnButton;
+    Button m_DimmerButton;
     RectTransform m_MenuButtonRect;
     bool m_PanelVisible;
     float m_LastToggleTime;
@@ -153,10 +154,36 @@ void SetPanelVisible(bool visible)
         if (m_ConfirmPanel != null)
             m_ConfirmPanel.SetActive(visible);
 
-        if (visible && m_ReturnButton != null)
-            StartCoroutine(SelectNextFrame(m_ReturnButton));
-        else if (!visible && EventSystem.current != null)
+        if (visible)
+        {
+            // Disable dimmer clicks until the pointer that opened the panel is
+            // released, otherwise the trailing PointerUp registers as a click on
+            // the dimmer and immediately closes the panel.
+            if (m_DimmerButton != null)
+            {
+                m_DimmerButton.interactable = false;
+                StartCoroutine(EnableDimmerAfterRelease());
+            }
+
+            if (m_ReturnButton != null)
+                StartCoroutine(SelectNextFrame(m_ReturnButton));
+        }
+        else if (EventSystem.current != null)
+        {
             EventSystem.current.SetSelectedGameObject(null);
+        }
+    }
+
+    IEnumerator EnableDimmerAfterRelease()
+    {
+        while ((Mouse.current != null && Mouse.current.leftButton.isPressed) ||
+               (Touchscreen.current != null && Touchscreen.current.primaryTouch.press.isPressed))
+            yield return null;
+
+        yield return null;
+
+        if (m_DimmerButton != null && m_PanelVisible)
+            m_DimmerButton.interactable = true;
     }
 
     IEnumerator SelectNextFrame(GameObject target)
@@ -210,7 +237,7 @@ void ActivateOwnEventSystem()
             return;
         }
 
-        var existing = FindObjectOfType<EventSystem>();
+        var existing = FindAnyObjectByType<EventSystem>();
         if (existing != null && existing.GetComponent<InputSystemUIInputModule>() != null)
             return;
 
@@ -304,7 +331,8 @@ void BuildConfirmPanel()
         dimmer.color = kOverlay;
         StretchRT(m_ConfirmPanel);
 
-        m_ConfirmPanel.AddComponent<Button>().onClick.AddListener(() => SetPanelVisible(false));
+        m_DimmerButton = m_ConfirmPanel.AddComponent<Button>();
+        m_DimmerButton.onClick.AddListener(() => SetPanelVisible(false));
 
         // Center card
         var card = new GameObject("Card", typeof(RectTransform));

Assets/QA/Tests/Core Platform Menu/SceneMenu.cs

@@ -151,7 +151,7 @@ static void SetupEventSystem()
         var activeScene = SceneManager.GetActiveScene();
         bool hasSceneES = false;
 
-        foreach (var es in FindObjectsOfType<EventSystem>())
+        foreach (var es in FindObjectsByType<EventSystem>(FindObjectsSortMode.None))
         {
             if (es.gameObject.scene == activeScene)
             {
@@ -380,13 +380,13 @@ void BuildSearchBar(Transform parent)
         var ph = MakeText("Placeholder", textArea.transform, "Search scenes\u2026", 18,
             kTextSecondary, TextAlignmentOptions.MidlineLeft);
         ph.fontStyle = FontStyles.Italic;
-        ph.enableWordWrapping = false;
+        ph.textWrappingMode = TextWrappingModes.NoWrap;
         ph.overflowMode = TextOverflowModes.Ellipsis;
         Stretch(ph.gameObject);
 
         var txt = MakeText("Text", textArea.transform, "", 18,
             kTextPrimary, TextAlignmentOptions.MidlineLeft);
-        txt.enableWordWrapping = false;
+        txt.textWrappingMode = TextWrappingModes.NoWrap;
         Stretch(txt.gameObject);
 
         var input = bar.AddComponent<TMP_InputField>();
@@ -612,7 +612,7 @@ void BuildSceneButton(Transform parent, SceneEntry entry)
         var nameT = MakeText("Name", go.transform, entry.displayName, 15, kTextPrimary,
             TextAlignmentOptions.Center);
         nameT.overflowMode      = TextOverflowModes.Ellipsis;
-        nameT.enableWordWrapping = false;
+        nameT.textWrappingMode = TextWrappingModes.NoWrap;
         var nr = Rect(nameT);
         nr.anchorMin = new Vector2(0.04f, 0.38f);
         nr.anchorMax = new Vector2(0.96f, 0.94f);
@@ -624,7 +624,7 @@ void BuildSceneButton(Transform parent, SceneEntry entry)
             var subT = MakeText("Sub", go.transform, entry.subcategory, 11, kTextSecondary,
                 TextAlignmentOptions.Center);
             subT.overflowMode      = TextOverflowModes.Ellipsis;
-            subT.enableWordWrapping = false;
+            subT.textWrappingMode = TextWrappingModes.NoWrap;
             var srr = Rect(subT);
             srr.anchorMin = new Vector2(0.04f, 0.06f);
             srr.anchorMax = new Vector2(0.96f, 0.38f);