Skip to content

Commit 4fc9c55

Browse files
authored
refactor!: Clean up roles and properties (#289)
1 parent d35c7c1 commit 4fc9c55

File tree

9 files changed

+224
-347
lines changed

9 files changed

+224
-347
lines changed

bindings/c/cbindgen.toml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,16 @@ renaming_overrides_prefixing = true
3333
"ActionHandlerCallback" = "accesskit_action_handler_callback"
3434
"Affine" = "accesskit_affine"
3535
"AriaCurrent" = "accesskit_aria_current"
36-
"CheckedState" = "accesskit_checked_state"
36+
"AutoComplete" = "accesskit_auto_complete"
37+
"Checked" = "accesskit_checked"
3738
"DefaultActionVerb" = "accesskit_default_action_verb"
38-
"DescriptionFrom" = "accesskit_description_from"
3939
"HWND" = "HWND"
4040
"HasPopup" = "accesskit_has_popup"
4141
"Invalid" = "accesskit_invalid"
4242
"LPARAM" = "LPARAM"
4343
"LRESULT" = "LRESULT"
4444
"ListStyle" = "accesskit_list_style"
4545
"Live" = "accesskit_live"
46-
"NameFrom" = "accesskit_name_from"
4746
"Orientation" = "accesskit_orientation"
4847
"Point" = "accesskit_point"
4948
"Rect" = "accesskit_rect"
@@ -57,14 +56,13 @@ renaming_overrides_prefixing = true
5756
"VerticalOffset" = "accesskit_vertical_offset"
5857
"WPARAM" = "WPARAM"
5958
"opt_AriaCurrent" = "accesskit_opt_aria_current"
60-
"opt_CheckedState" = "accesskit_opt_checked_state"
59+
"opt_AutoComplete" = "accesskit_opt_auto_complete"
60+
"opt_Checked" = "accesskit_opt_checked"
6161
"opt_DefaultActionVerb" = "accesskit_opt_default_action_verb"
62-
"opt_DescriptionFrom" = "accesskit_opt_description_from"
6362
"opt_HasPopup" = "accesskit_opt_has_popup"
6463
"opt_Invalid" = "accesskit_opt_invalid"
6564
"opt_ListStyle" = "accesskit_opt_list_style"
6665
"opt_Live" = "accesskit_opt_live"
67-
"opt_NameFrom" = "accesskit_opt_name_from"
6866
"opt_Orientation" = "accesskit_opt_orientation"
6967
"opt_SortDirection" = "accesskit_opt_sort_direction"
7068
"opt_TextAlign" = "accesskit_opt_text_align"

bindings/c/src/common.rs

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -534,41 +534,31 @@ impl node_builder {
534534
}
535535

536536
flag_methods! {
537-
(is_autofill_available, set_autofill_available, clear_autofill_available),
538-
(is_default, set_default, clear_default),
539-
(is_editable, set_editable, clear_editable),
540537
(is_hovered, set_hovered, clear_hovered),
541538
(is_hidden, set_hidden, clear_hidden),
542539
(is_linked, set_linked, clear_linked),
543-
(is_multiline, set_multiline, clear_multiline),
544540
(is_multiselectable, set_multiselectable, clear_multiselectable),
545-
(is_protected, set_protected, clear_protected),
546541
(is_required, set_required, clear_required),
547542
(is_visited, set_visited, clear_visited),
548543
(is_busy, set_busy, clear_busy),
549544
(is_live_atomic, set_live_atomic, clear_live_atomic),
550545
(is_modal, set_modal, clear_modal),
551-
(is_scrollable, set_scrollable, clear_scrollable),
552-
(is_selected_from_focus, set_selected_from_focus, clear_selected_from_focus),
553-
(is_touch_pass_through, set_touch_pass_through, clear_touch_pass_through),
546+
(is_touch_transparent, set_touch_transparent, clear_touch_transparent),
554547
(is_read_only, set_read_only, clear_read_only),
555548
(is_disabled, set_disabled, clear_disabled),
556549
(is_bold, set_bold, clear_bold),
557550
(is_italic, set_italic, clear_italic),
558-
(canvas_has_fallback, set_canvas_has_fallback, clear_canvas_has_fallback),
559551
(clips_children, set_clips_children, clear_clips_children),
560552
(is_line_breaking_object, set_is_line_breaking_object, clear_is_line_breaking_object),
561553
(is_page_breaking_object, set_is_page_breaking_object, clear_is_page_breaking_object),
562554
(is_spelling_error, set_is_spelling_error, clear_is_spelling_error),
563555
(is_grammar_error, set_is_grammar_error, clear_is_grammar_error),
564556
(is_search_match, set_is_search_match, clear_is_search_match),
565-
(is_suggestion, set_is_suggestion, clear_is_suggestion),
566-
(is_nonatomic_text_field_root, set_is_nonatomic_text_field_root, clear_is_nonatomic_text_field_root)
557+
(is_suggestion, set_is_suggestion, clear_is_suggestion)
567558
}
568559

569560
node_id_vec_property_methods! {
570561
(children, set_children, push_child, clear_children),
571-
(indirect_children, set_indirect_children, push_indirect_child, clear_indirect_children),
572562
(controls, set_controls, push_controlled, clear_controls),
573563
(details, set_details, push_detail, clear_details),
574564
(described_by, set_described_by, push_described_by, clear_described_by),
@@ -602,20 +592,15 @@ string_property_methods! {
602592
(description, set_description, clear_description),
603593
(value, set_value, clear_value),
604594
(access_key, set_access_key, clear_access_key),
605-
(auto_complete, set_auto_complete, clear_auto_complete),
606-
(checked_state_description, set_checked_state_description, clear_checked_state_description),
607595
(class_name, set_class_name, clear_class_name),
608-
(css_display, set_css_display, clear_css_display),
609596
(font_family, set_font_family, clear_font_family),
610597
(html_tag, set_html_tag, clear_html_tag),
611598
(inner_html, set_inner_html, clear_inner_html),
612-
(input_type, set_input_type, clear_input_type),
613-
(key_shortcuts, set_key_shortcuts, clear_key_shortcuts),
599+
(keyboard_shortcut, set_keyboard_shortcut, clear_keyboard_shortcut),
614600
(language, set_language, clear_language),
615-
(live_relevant, set_live_relevant, clear_live_relevant),
616601
(placeholder, set_placeholder, clear_placeholder),
617-
(aria_role, set_aria_role, clear_aria_role),
618602
(role_description, set_role_description, clear_role_description),
603+
(state_description, set_state_description, clear_state_description),
619604
(tooltip, set_tooltip, clear_tooltip),
620605
(url, set_url, clear_url)
621606
}
@@ -633,8 +618,7 @@ f64_property_methods! {
633618
(numeric_value_step, set_numeric_value_step, clear_numeric_value_step),
634619
(numeric_value_jump, set_numeric_value_jump, clear_numeric_value_jump),
635620
(font_size, set_font_size, clear_font_size),
636-
(font_weight, set_font_weight, clear_font_weight),
637-
(text_indent, set_text_indent, clear_text_indent)
621+
(font_weight, set_font_weight, clear_font_weight)
638622
}
639623

640624
usize_property_methods! {
@@ -679,16 +663,15 @@ bool_property_methods! {
679663
}
680664

681665
unique_enum_property_methods! {
682-
(NameFrom, name_from, set_name_from, clear_name_from),
683-
(DescriptionFrom, description_from, set_description_from, clear_description_from),
684666
(Invalid, invalid, set_invalid, clear_invalid),
685-
(CheckedState, checked_state, set_checked_state, clear_checked_state),
667+
(Checked, checked, set_checked, clear_checked),
686668
(Live, live, set_live, clear_live),
687669
(DefaultActionVerb, default_action_verb, set_default_action_verb, clear_default_action_verb),
688670
(TextDirection, text_direction, set_text_direction, clear_text_direction),
689671
(Orientation, orientation, set_orientation, clear_orientation),
690672
(SortDirection, sort_direction, set_sort_direction, clear_sort_direction),
691673
(AriaCurrent, aria_current, set_aria_current, clear_aria_current),
674+
(AutoComplete, auto_complete, set_auto_complete, clear_auto_complete),
692675
(HasPopup, has_popup, set_has_popup, clear_has_popup),
693676
(ListStyle, list_style, set_list_style, clear_list_style),
694677
(TextAlign, text_align, set_text_align, clear_text_align),

0 commit comments

Comments
 (0)