Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,10 @@ pub enum Role {
FigureCaption,
Figure,
Footer,
FooterAsNonLandmark,
Form,
Grid,
Group,
Header,
HeaderAsNonLandmark,
Heading,
Iframe,
IframePresentational,
Expand Down Expand Up @@ -181,6 +179,8 @@ pub enum Role {
ScrollView,
Search,
Section,
SectionFooter,
SectionHeader,
Slider,
SpinButton,
Splitter,
Expand Down
7 changes: 3 additions & 4 deletions platforms/atspi-common/src/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,7 @@ impl NodeWrapper<'_> {
// names should be exposed as `AtspiRole::Landmark` according to Core AAM.
Role::Form => AtspiRole::Form,
Role::Figure | Role::Feed => AtspiRole::Panel,
Role::GenericContainer
| Role::FooterAsNonLandmark
| Role::HeaderAsNonLandmark
| Role::Ruby => AtspiRole::Section,
Role::GenericContainer | Role::Ruby => AtspiRole::Section,
Role::GraphicsDocument => AtspiRole::DocumentFrame,
Role::GraphicsObject => AtspiRole::Panel,
Role::GraphicsSymbol => AtspiRole::Image,
Expand Down Expand Up @@ -224,6 +221,8 @@ impl NodeWrapper<'_> {
// shows up in the tree.
Role::RubyAnnotation => AtspiRole::Static,
Role::Section => AtspiRole::Section,
Role::SectionFooter => AtspiRole::Footer,
Role::SectionHeader => AtspiRole::Header,
Role::ScrollBar => AtspiRole::ScrollBar,
Role::Search => AtspiRole::Landmark,
Role::Slider => AtspiRole::Slider,
Expand Down
6 changes: 4 additions & 2 deletions platforms/macos/src/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,10 @@ fn ns_role(node: &Node) -> &'static NSAccessibilityRole {
Role::FigureCaption => NSAccessibilityGroupRole,
Role::Figure => NSAccessibilityGroupRole,
Role::Footer => NSAccessibilityGroupRole,
Role::FooterAsNonLandmark => NSAccessibilityGroupRole,
Role::Form => NSAccessibilityGroupRole,
Role::Grid => NSAccessibilityTableRole,
Role::Group => NSAccessibilityGroupRole,
Role::Header => NSAccessibilityGroupRole,
Role::HeaderAsNonLandmark => NSAccessibilityGroupRole,
Role::Heading => ns_string!("Heading"),
Role::Iframe => NSAccessibilityGroupRole,
Role::IframePresentational => NSAccessibilityGroupRole,
Expand Down Expand Up @@ -159,6 +157,8 @@ fn ns_role(node: &Node) -> &'static NSAccessibilityRole {
Role::ScrollView => NSAccessibilityUnknownRole,
Role::Search => NSAccessibilityGroupRole,
Role::Section => NSAccessibilityGroupRole,
Role::SectionFooter => NSAccessibilityGroupRole,
Role::SectionHeader => NSAccessibilityGroupRole,
Role::Slider => NSAccessibilitySliderRole,
Role::SpinButton => NSAccessibilityIncrementorRole,
Role::Splitter => NSAccessibilitySplitterRole,
Expand Down Expand Up @@ -272,6 +272,8 @@ fn ns_sub_role(node: &Node) -> &'static NSAccessibilitySubrole {
Role::Region => ns_string!("AXLandmarkRegion"),
Role::Search => ns_string!("AXLandmarkSearch"),
Role::SearchInput => NSAccessibilitySearchFieldSubrole,
Role::SectionFooter => ns_string!("AXSectionFooter"),
Role::SectionHeader => ns_string!("AXSectionHeader"),
Role::Status => ns_string!("AXApplicationStatus"),
Role::Strong => ns_string!("AXStrongStyleGroup"),
Role::Switch => NSAccessibilitySwitchSubrole,
Expand Down
4 changes: 2 additions & 2 deletions platforms/windows/src/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,10 @@ impl NodeWrapper<'_> {
Role::FigureCaption => UIA_TextControlTypeId,
Role::Figure => UIA_GroupControlTypeId,
Role::Footer => UIA_GroupControlTypeId,
Role::FooterAsNonLandmark => UIA_GroupControlTypeId,
Role::Form => UIA_GroupControlTypeId,
Role::Grid => UIA_DataGridControlTypeId,
Role::Group => UIA_GroupControlTypeId,
Role::Header => UIA_GroupControlTypeId,
Role::HeaderAsNonLandmark => UIA_GroupControlTypeId,
Role::Heading => UIA_TextControlTypeId,
Role::Iframe => UIA_DocumentControlTypeId,
Role::IframePresentational => UIA_GroupControlTypeId,
Expand Down Expand Up @@ -181,6 +179,8 @@ impl NodeWrapper<'_> {
Role::ScrollView => UIA_PaneControlTypeId,
Role::Search => UIA_GroupControlTypeId,
Role::Section => UIA_GroupControlTypeId,
Role::SectionFooter => UIA_GroupControlTypeId,
Role::SectionHeader => UIA_GroupControlTypeId,
Role::Slider => UIA_SliderControlTypeId,
Role::SpinButton => UIA_SpinnerControlTypeId,
Role::Splitter => UIA_SeparatorControlTypeId,
Expand Down