Merge branch 'unite2025/lsp-uitk' into unite2025/screen-reader-improvements

Bianca Marina Stana · Bianca Marina Stana · commit 027b9d2222d8 · 2025-10-03T12:06:30.000-04:00
diff --git a/Assets/Scripts/Screen Reader/UGUI/AccessibleElement.cs b/Assets/Scripts/Screen Reader/UGUI/AccessibleElement.cs
@@ -70,7 +70,6 @@ public event Func<bool> selected
         public event Action incremented;
         public event Action decremented;
 
-#if UNITY_6000_3_OR_NEWER
         event Func<AccessibilityScrollDirection, bool> m_Scrolled;
         public event Func<AccessibilityScrollDirection, bool> scrolled
         {
@@ -89,7 +88,6 @@ public event Func<AccessibilityScrollDirection, bool> scrolled
                 }
             }
         }
-#endif // UNITY_6000_3_OR_NEWER
 
         event Func<bool> m_Dismissed;
         public event Func<bool> dismissed
@@ -242,12 +240,7 @@ void DisconnectFromSelected()
 
         bool InvokeSelected()
         {
-            var success = m_Selected?.Invoke() ?? false;
-
-            node.value = value;
-            node.state = state;
-
-            return success;
+            return m_Selected?.Invoke() ?? false;
         }
 
         void ConnectToIncremented()
@@ -304,12 +297,12 @@ void InvokeDecremented()
 
         void ConnectToScrolled()
         {
-#if UNITY_6000_3_OR_NEWER
             if (node == null || m_Scrolled == null)
             {
                 return;
             }
 
+#if UNITY_6000_3_OR_NEWER
             node.scrolled -= InvokeScrolled;
             node.scrolled += InvokeScrolled;
 #endif // UNITY_6000_3_OR_NEWER
@@ -327,12 +320,10 @@ void DisconnectFromScrolled()
 #endif // UNITY_6000_3_OR_NEWER
         }
 
-#if UNITY_6000_3_OR_NEWER
         bool InvokeScrolled(AccessibilityScrollDirection direction)
         {
             return m_Scrolled?.Invoke(direction) ?? false;
         }
-#endif // UNITY_6000_3_OR_NEWER
 
         void ConnectToDismissed()
         {
diff --git a/Assets/Scripts/Screen Reader/UITk/Handlers/DropdownFieldHandler.cs b/Assets/Scripts/Screen Reader/UITk/Handlers/DropdownFieldHandler.cs
@@ -90,7 +90,9 @@ void CheckForOpenedPopupMenu()
             {
                 var popupAcc = popupMenu.GetOrCreateAccessibleProperties();
 
+#if UNITY_6000_3_OR_NEWER
                 popupAcc.role = AccessibilityRole.Dropdown;
+#endif // UNITY_6000_3_OR_NEWER
                 popupAcc.active = false;
                 popupAcc.modal = true;
 
@@ -116,15 +118,20 @@ void CheckForOpenedPopupMenu()
                 // NotifyChange();
             }
 
-            /*var popup = ve.Q("unity-popup");
+            /*
+ #if UNITY_6000_3_OR_NEWER
+            var popup = ve.Q("unity-popup");
+
             if (popup != null && popup.style.display == DisplayStyle.Flex)
             {
                 SetState(AccessibilityState.Expanded);
             }
             else
             {
                 SetState(AccessibilityState.Collapsed);
-            }*/
+            }
+#endif // UNITY_6000_3_OR_NEWER
+            */
         }
     }
 }
diff --git a/Assets/Scripts/Screen Reader/UITk/Handlers/SliderHandler.cs b/Assets/Scripts/Screen Reader/UITk/Handlers/SliderHandler.cs
@@ -30,6 +30,8 @@ public void Step(bool incr)
             slider.value += step;
         }
 
+#if UNITY_2023_3_OR_NEWER
         public override AccessibilityRole GetRole() => AccessibilityRole.Slider;
+#endif // UNITY_2023_3_OR_NEWER
     }
 }
diff --git a/Assets/Scripts/Screen Reader/UITk/Handlers/TextFieldHandler.cs b/Assets/Scripts/Screen Reader/UITk/Handlers/TextFieldHandler.cs
@@ -44,9 +44,8 @@ public override string GetHint()
             return base.GetHint();
         }
 
-        public override AccessibilityRole GetRole()
-        {
-            return AccessibilityRole.TextField;
-        }
+#if UNITY_6000_3_OR_NEWER
+        public override AccessibilityRole GetRole() => AccessibilityRole.TextField;
+#endif // UNITY_6000_3_OR_NEWER
     }
 }
diff --git a/Assets/Scripts/Screen Reader/UITk/Handlers/VisualElementAccessibilityHandler.cs b/Assets/Scripts/Screen Reader/UITk/Handlers/VisualElementAccessibilityHandler.cs
@@ -232,7 +232,6 @@ public event Func<bool> selected
         public event Action incremented;
         public event Action decremented;
 
-#if UNITY_6000_3_OR_NEWER
         event Func<AccessibilityScrollDirection, bool> m_Scrolled;
         public event Func<AccessibilityScrollDirection, bool> scrolled
         {
@@ -251,7 +250,6 @@ public event Func<AccessibilityScrollDirection, bool> scrolled
                 }
             }
         }
-#endif // UNITY_6000_3_OR_NEWER
 
         event Func<bool> m_Dismissed;
         public event Func<bool> dismissed
@@ -410,9 +408,6 @@ bool InvokeSelected()
 
             success |= m_Selected?.Invoke() ?? false;
 
-            node.value = value;
-            node.state = state;
-
             return success;
         }
 
@@ -441,9 +436,6 @@ void InvokeIncremented()
         {
             m_OwnerElement?.GetAccessibleProperties()?.InvokeIncremented();
             incremented?.Invoke();
-
-            node.value = value;
-            node.state = state;
         }
 
         void ConnectToDecremented()
@@ -471,19 +463,17 @@ void InvokeDecremented()
         {
             m_OwnerElement?.GetAccessibleProperties()?.InvokeDecremented();
             decremented?.Invoke();
-
-            node.value = value;
-            node.state = state;
         }
 
         void ConnectToScrolled()
         {
-#if UNITY_6000_3_OR_NEWER
             if (node == null || !m_Scrollable)
             {
                 return;
             }
 
+
+#if UNITY_6000_3_OR_NEWER
             node.scrolled -= InvokeScrolled;
             node.scrolled += InvokeScrolled;
 #endif // UNITY_6000_3_OR_NEWER
@@ -501,7 +491,6 @@ void DisconnectFromScrolled()
 #endif // UNITY_6000_3_OR_NEWER
         }
 
-#if UNITY_6000_3_OR_NEWER
         bool InvokeScrolled(AccessibilityScrollDirection direction)
         {
             var success = false;
@@ -515,7 +504,6 @@ bool InvokeScrolled(AccessibilityScrollDirection direction)
 
             return success;
         }
-#endif // UNITY_6000_3_OR_NEWER
 
         void ConnectToDismissed()
         {
diff --git a/Assets/UI/Images/Splash-Screen.png b/Assets/UI/Images/Splash-Screen.png
diff --git a/Assets/UI/Images/Splash-Screen@2x.png b/Assets/UI/Images/Splash-Screen@2x.png

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ public event Func<bool> selected`
`70`	`70`	`public event Action incremented;`
`71`	`71`	`public event Action decremented;`
`72`	`72`
`73`		`-#if UNITY_6000_3_OR_NEWER`
`74`	`73`	`event Func<AccessibilityScrollDirection, bool> m_Scrolled;`
`75`	`74`	`public event Func<AccessibilityScrollDirection, bool> scrolled`
`76`	`75`	`{`
`@@ -89,7 +88,6 @@ public event Func<AccessibilityScrollDirection, bool> scrolled`
`89`	`88`	`}`
`90`	`89`	`}`
`91`	`90`	`}`
`92`		`-#endif // UNITY_6000_3_OR_NEWER`
`93`	`91`
`94`	`92`	`event Func<bool> m_Dismissed;`
`95`	`93`	`public event Func<bool> dismissed`
`@@ -242,12 +240,7 @@ void DisconnectFromSelected()`
`242`	`240`
`243`	`241`	`bool InvokeSelected()`
`244`	`242`	`{`
`245`		`- var success = m_Selected?.Invoke() ?? false;`
`246`		`-`
`247`		`- node.value = value;`
`248`		`- node.state = state;`
`249`		`-`
`250`		`- return success;`
	`243`	`+ return m_Selected?.Invoke() ?? false;`
`251`	`244`	`}`
`252`	`245`
`253`	`246`	`void ConnectToIncremented()`
`@@ -304,12 +297,12 @@ void InvokeDecremented()`
`304`	`297`
`305`	`298`	`void ConnectToScrolled()`
`306`	`299`	`{`
`307`		`-#if UNITY_6000_3_OR_NEWER`
`308`	`300`	`if (node == null \|\| m_Scrolled == null)`
`309`	`301`	`{`
`310`	`302`	`return;`
`311`	`303`	`}`
`312`	`304`
	`305`	`+#if UNITY_6000_3_OR_NEWER`
`313`	`306`	`node.scrolled -= InvokeScrolled;`
`314`	`307`	`node.scrolled += InvokeScrolled;`
`315`	`308`	`#endif // UNITY_6000_3_OR_NEWER`
`@@ -327,12 +320,10 @@ void DisconnectFromScrolled()`
`327`	`320`	`#endif // UNITY_6000_3_OR_NEWER`
`328`	`321`	`}`
`329`	`322`
`330`		`-#if UNITY_6000_3_OR_NEWER`
`331`	`323`	`bool InvokeScrolled(AccessibilityScrollDirection direction)`
`332`	`324`	`{`
`333`	`325`	`return m_Scrolled?.Invoke(direction) ?? false;`
`334`	`326`	`}`
`335`		`-#endif // UNITY_6000_3_OR_NEWER`
`336`	`327`
`337`	`328`	`void ConnectToDismissed()`
`338`	`329`	`{`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,9 @@ void CheckForOpenedPopupMenu()`
`90`	`90`	`{`
`91`	`91`	`var popupAcc = popupMenu.GetOrCreateAccessibleProperties();`
`92`	`92`
	`93`	`+#if UNITY_6000_3_OR_NEWER`
`93`	`94`	`popupAcc.role = AccessibilityRole.Dropdown;`
	`95`	`+#endif // UNITY_6000_3_OR_NEWER`
`94`	`96`	`popupAcc.active = false;`
`95`	`97`	`popupAcc.modal = true;`
`96`	`98`
`@@ -116,15 +118,20 @@ void CheckForOpenedPopupMenu()`
`116`	`118`	`// NotifyChange();`
`117`	`119`	`}`
`118`	`120`
`119`		`- /*var popup = ve.Q("unity-popup");`
	`121`	`+ /*`
	`122`	`+ #if UNITY_6000_3_OR_NEWER`
	`123`	`+ var popup = ve.Q("unity-popup");`
	`124`	`+`
`120`	`125`	`if (popup != null && popup.style.display == DisplayStyle.Flex)`
`121`	`126`	`{`
`122`	`127`	`SetState(AccessibilityState.Expanded);`
`123`	`128`	`}`
`124`	`129`	`else`
`125`	`130`	`{`
`126`	`131`	`SetState(AccessibilityState.Collapsed);`
`127`		`- }*/`
	`132`	`+ }`
	`133`	`+#endif // UNITY_6000_3_OR_NEWER`
	`134`	`+ */`
`128`	`135`	`}`
`129`	`136`	`}`
`130`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ public void Step(bool incr)`
`30`	`30`	`slider.value += step;`
`31`	`31`	`}`
`32`	`32`
	`33`	`+#if UNITY_2023_3_OR_NEWER`
`33`	`34`	`public override AccessibilityRole GetRole() => AccessibilityRole.Slider;`
	`35`	`+#endif // UNITY_2023_3_OR_NEWER`
`34`	`36`	`}`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,8 @@ public override string GetHint()`
`44`	`44`	`return base.GetHint();`
`45`	`45`	`}`
`46`	`46`
`47`		`- public override AccessibilityRole GetRole()`
`48`		`- {`
`49`		`- return AccessibilityRole.TextField;`
`50`		`- }`
	`47`	`+#if UNITY_6000_3_OR_NEWER`
	`48`	`+ public override AccessibilityRole GetRole() => AccessibilityRole.TextField;`
	`49`	`+#endif // UNITY_6000_3_OR_NEWER`
`51`	`50`	`}`
`52`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,6 @@ public event Func<bool> selected`
`232`	`232`	`public event Action incremented;`
`233`	`233`	`public event Action decremented;`
`234`	`234`
`235`		`-#if UNITY_6000_3_OR_NEWER`
`236`	`235`	`event Func<AccessibilityScrollDirection, bool> m_Scrolled;`
`237`	`236`	`public event Func<AccessibilityScrollDirection, bool> scrolled`
`238`	`237`	`{`
`@@ -251,7 +250,6 @@ public event Func<AccessibilityScrollDirection, bool> scrolled`
`251`	`250`	`}`
`252`	`251`	`}`
`253`	`252`	`}`
`254`		`-#endif // UNITY_6000_3_OR_NEWER`
`255`	`253`
`256`	`254`	`event Func<bool> m_Dismissed;`
`257`	`255`	`public event Func<bool> dismissed`
`@@ -410,9 +408,6 @@ bool InvokeSelected()`
`410`	`408`
`411`	`409`	`success \|= m_Selected?.Invoke() ?? false;`
`412`	`410`
`413`		`- node.value = value;`
`414`		`- node.state = state;`
`415`		`-`
`416`	`411`	`return success;`
`417`	`412`	`}`
`418`	`413`
`@@ -441,9 +436,6 @@ void InvokeIncremented()`
`441`	`436`	`{`
`442`	`437`	`m_OwnerElement?.GetAccessibleProperties()?.InvokeIncremented();`
`443`	`438`	`incremented?.Invoke();`
`444`		`-`
`445`		`- node.value = value;`
`446`		`- node.state = state;`
`447`	`439`	`}`
`448`	`440`
`449`	`441`	`void ConnectToDecremented()`
`@@ -471,19 +463,17 @@ void InvokeDecremented()`
`471`	`463`	`{`
`472`	`464`	`m_OwnerElement?.GetAccessibleProperties()?.InvokeDecremented();`
`473`	`465`	`decremented?.Invoke();`
`474`		`-`
`475`		`- node.value = value;`
`476`		`- node.state = state;`
`477`	`466`	`}`
`478`	`467`
`479`	`468`	`void ConnectToScrolled()`
`480`	`469`	`{`
`481`		`-#if UNITY_6000_3_OR_NEWER`
`482`	`470`	`if (node == null \|\| !m_Scrollable)`
`483`	`471`	`{`
`484`	`472`	`return;`
`485`	`473`	`}`
`486`	`474`
	`475`	`+`
	`476`	`+#if UNITY_6000_3_OR_NEWER`
`487`	`477`	`node.scrolled -= InvokeScrolled;`
`488`	`478`	`node.scrolled += InvokeScrolled;`
`489`	`479`	`#endif // UNITY_6000_3_OR_NEWER`
`@@ -501,7 +491,6 @@ void DisconnectFromScrolled()`
`501`	`491`	`#endif // UNITY_6000_3_OR_NEWER`
`502`	`492`	`}`
`503`	`493`
`504`		`-#if UNITY_6000_3_OR_NEWER`
`505`	`494`	`bool InvokeScrolled(AccessibilityScrollDirection direction)`
`506`	`495`	`{`
`507`	`496`	`var success = false;`
`@@ -515,7 +504,6 @@ bool InvokeScrolled(AccessibilityScrollDirection direction)`
`515`	`504`
`516`	`505`	`return success;`
`517`	`506`	`}`
`518`		`-#endif // UNITY_6000_3_OR_NEWER`
`519`	`507`
`520`	`508`	`void ConnectToDismissed()`
`521`	`509`	`{`