diff --git a/common/src/lib.rs b/common/src/lib.rs index eeaaa857..893bb208 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -129,11 +129,8 @@ pub enum Role { ContentInfo, Definition, DescriptionList, - DescriptionListDetail, - DescriptionListTerm, Details, Dialog, - Directory, DisclosureTriangle, Document, EmbeddedObject, @@ -167,8 +164,6 @@ pub enum Role { Navigation, Note, PluginObject, - Portal, - Pre, ProgressIndicator, RadioGroup, Region, diff --git a/consumer/src/node.rs b/consumer/src/node.rs index d913e914..3652359b 100644 --- a/consumer/src/node.rs +++ b/consumer/src/node.rs @@ -707,8 +707,6 @@ impl<'a> Node<'a> { Role::Article | Role::Definition | Role::DescriptionList - | Role::DescriptionListTerm - | Role::Directory | Role::Document | Role::GraphicsDocument | Role::Image @@ -752,7 +750,6 @@ impl<'a> Node<'a> { | Role::ListBoxOption | Role::MenuListOption | Role::RadioButton - | Role::DescriptionListTerm | Role::Term ) } diff --git a/platforms/android/Cargo.toml b/platforms/android/Cargo.toml index c5f45350..afb4d038 100644 --- a/platforms/android/Cargo.toml +++ b/platforms/android/Cargo.toml @@ -19,4 +19,3 @@ accesskit = { version = "0.21.1", path = "../../common" } accesskit_consumer = { version = "0.31.0", path = "../../consumer" } jni = "0.21.1" log = "0.4.17" - diff --git a/platforms/atspi-common/src/node.rs b/platforms/atspi-common/src/node.rs index 7a81ff77..8335512c 100644 --- a/platforms/atspi-common/src/node.rs +++ b/platforms/atspi-common/src/node.rs @@ -97,12 +97,10 @@ impl NodeWrapper<'_> { Role::ContentDeletion => AtspiRole::ContentDeletion, Role::ContentInsertion => AtspiRole::ContentInsertion, Role::ContentInfo | Role::Footer => AtspiRole::Landmark, - Role::Definition | Role::DescriptionListDetail => AtspiRole::DescriptionValue, + Role::Definition => AtspiRole::DescriptionValue, Role::DescriptionList => AtspiRole::DescriptionList, - Role::DescriptionListTerm => AtspiRole::DescriptionTerm, Role::Details => AtspiRole::Panel, Role::Dialog => AtspiRole::Dialog, - Role::Directory => AtspiRole::List, Role::DisclosureTriangle => AtspiRole::ToggleButton, Role::DocCover => AtspiRole::Image, Role::DocBackLink | Role::DocBiblioRef | Role::DocGlossRef | Role::DocNoteRef => { @@ -202,8 +200,6 @@ impl NodeWrapper<'_> { Role::PdfActionableHighlight => AtspiRole::Button, Role::PdfRoot => AtspiRole::DocumentFrame, Role::PluginObject => AtspiRole::Embedded, - Role::Portal => AtspiRole::Button, - Role::Pre => AtspiRole::Section, Role::ProgressIndicator => AtspiRole::ProgressBar, Role::RadioButton => AtspiRole::RadioButton, Role::RadioGroup => AtspiRole::Panel, diff --git a/platforms/macos/src/node.rs b/platforms/macos/src/node.rs index 7a325cd6..8b1162cb 100644 --- a/platforms/macos/src/node.rs +++ b/platforms/macos/src/node.rs @@ -107,11 +107,8 @@ fn ns_role(node: &Node) -> &'static NSAccessibilityRole { Role::ContentInfo => NSAccessibilityGroupRole, Role::Definition => NSAccessibilityGroupRole, Role::DescriptionList => NSAccessibilityListRole, - Role::DescriptionListDetail => NSAccessibilityGroupRole, - Role::DescriptionListTerm => NSAccessibilityGroupRole, Role::Details => NSAccessibilityGroupRole, Role::Dialog => NSAccessibilityGroupRole, - Role::Directory => NSAccessibilityListRole, Role::DisclosureTriangle => NSAccessibilityButtonRole, Role::Document => NSAccessibilityGroupRole, Role::EmbeddedObject => NSAccessibilityGroupRole, @@ -145,8 +142,6 @@ fn ns_role(node: &Node) -> &'static NSAccessibilityRole { Role::Navigation => NSAccessibilityGroupRole, Role::Note => NSAccessibilityGroupRole, Role::PluginObject => NSAccessibilityGroupRole, - Role::Portal => NSAccessibilityButtonRole, - Role::Pre => NSAccessibilityGroupRole, Role::ProgressIndicator => NSAccessibilityProgressIndicatorRole, Role::RadioGroup => NSAccessibilityRadioGroupRole, Role::Region => NSAccessibilityGroupRole, diff --git a/platforms/unix/Cargo.toml b/platforms/unix/Cargo.toml index aec1fbe5..cbddce79 100644 --- a/platforms/unix/Cargo.toml +++ b/platforms/unix/Cargo.toml @@ -36,4 +36,3 @@ tokio-stream = { version = "0.1.14", optional = true } version = "1.32.0" optional = true features = ["macros", "net", "rt", "sync", "time"] - diff --git a/platforms/windows/src/node.rs b/platforms/windows/src/node.rs index c2477429..5a6c70bd 100644 --- a/platforms/windows/src/node.rs +++ b/platforms/windows/src/node.rs @@ -120,11 +120,8 @@ impl NodeWrapper<'_> { Role::ContentInfo => UIA_GroupControlTypeId, Role::Definition => UIA_GroupControlTypeId, Role::DescriptionList => UIA_ListControlTypeId, - Role::DescriptionListDetail => UIA_TextControlTypeId, - Role::DescriptionListTerm => UIA_ListItemControlTypeId, Role::Details => UIA_GroupControlTypeId, Role::Dialog => UIA_PaneControlTypeId, - Role::Directory => UIA_ListControlTypeId, Role::DisclosureTriangle => UIA_ButtonControlTypeId, Role::Document | Role::Terminal => UIA_DocumentControlTypeId, Role::EmbeddedObject => UIA_PaneControlTypeId, @@ -158,8 +155,6 @@ impl NodeWrapper<'_> { Role::Navigation => UIA_GroupControlTypeId, Role::Note => UIA_GroupControlTypeId, Role::PluginObject => UIA_GroupControlTypeId, - Role::Portal => UIA_ButtonControlTypeId, - Role::Pre => UIA_GroupControlTypeId, Role::ProgressIndicator => UIA_ProgressBarControlTypeId, Role::RadioGroup => UIA_GroupControlTypeId, Role::Region => UIA_GroupControlTypeId, diff --git a/platforms/winit/Cargo.toml b/platforms/winit/Cargo.toml index e7aeb8a1..275c9c9a 100644 --- a/platforms/winit/Cargo.toml +++ b/platforms/winit/Cargo.toml @@ -48,3 +48,4 @@ softbuffer = { version = "0.4.0", default-features = false, features = [ "wayland", "wayland-dlopen", ] } +