motimat/Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed wrong Mac roles used for List, ListItem, and StatusBar (#20681)

Browse Source
This commit is contained in:
Melissa
2026-02-13 16:57:55 +01:00
committed by GitHub
parent 2185ce04e7
commit 1e7f817547
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/Avalonia.Native/src/OSX/automation.mm
+10 -4
View File
@@ -96,8 +96,8 @@
case AutomationEdit: return NSAccessibilityTextFieldRole; case AutomationEdit: return NSAccessibilityTextFieldRole;
case AutomationHyperlink: return NSAccessibilityLinkRole; case AutomationHyperlink: return NSAccessibilityLinkRole;
case AutomationImage: return NSAccessibilityImageRole; case AutomationImage: return NSAccessibilityImageRole;
case AutomationListItem: return NSAccessibilityRowRole; case AutomationListItem: return NSAccessibilityGroupRole;
case AutomationList: return NSAccessibilityTableRole; case AutomationList: return NSAccessibilityListRole;
case AutomationMenu: return NSAccessibilityMenuBarRole; case AutomationMenu: return NSAccessibilityMenuBarRole;
case AutomationMenuBar: return NSAccessibilityMenuBarRole; case AutomationMenuBar: return NSAccessibilityMenuBarRole;
case AutomationMenuItem: return NSAccessibilityMenuItemRole; case AutomationMenuItem: return NSAccessibilityMenuItemRole;
@@ -106,7 +106,7 @@
case AutomationScrollBar: return NSAccessibilityScrollBarRole; case AutomationScrollBar: return NSAccessibilityScrollBarRole;
case AutomationSlider: return NSAccessibilitySliderRole; case AutomationSlider: return NSAccessibilitySliderRole;
case AutomationSpinner: return NSAccessibilityIncrementorRole; case AutomationSpinner: return NSAccessibilityIncrementorRole;
case AutomationStatusBar: return NSAccessibilityTableRole; case AutomationStatusBar: return NSAccessibilityGroupRole;
case AutomationTab: return NSAccessibilityTabGroupRole; case AutomationTab: return NSAccessibilityTabGroupRole;
case AutomationTabItem: return NSAccessibilityRadioButtonRole; case AutomationTabItem: return NSAccessibilityRadioButtonRole;
case AutomationText: return NSAccessibilityStaticTextRole; case AutomationText: return NSAccessibilityStaticTextRole;
@@ -137,6 +137,11 @@
- (NSAccessibilitySubrole)accessibilitySubrole - (NSAccessibilitySubrole)accessibilitySubrole
{ {
auto controlType = _peer->GetAutomationControlType();
switch (controlType) {
case AutomationList: return @"AXContentList";
}
auto landmarkType = _peer->GetLandmarkType(); auto landmarkType = _peer->GetLandmarkType();
switch (landmarkType) { switch (landmarkType) {
case LandmarkBanner: return @"AXLandmarkBanner"; case LandmarkBanner: return @"AXLandmarkBanner";
@@ -147,8 +152,9 @@
case LandmarkMain: return @"AXLandmarkMain"; case LandmarkMain: return @"AXLandmarkMain";
case LandmarkNavigation: return @"AXLandmarkNavigation"; case LandmarkNavigation: return @"AXLandmarkNavigation";
case LandmarkSearch: return @"AXLandmarkSearch"; case LandmarkSearch: return @"AXLandmarkSearch";
default: return NSAccessibilityUnknownSubrole;
} }
return NSAccessibilityUnknownSubrole;
} }
- (NSString *)accessibilityRoleDescription - (NSString *)accessibilityRoleDescription