language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 10:50:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Implement accessible-delegate-focus for the AccessKit backend

Browse source
This commit is contained in:
DataTriny 2024-10-21 18:54:29 +02:00 • committed by Simon Hausmann
parent 6717e627a1
commit 28b5a67583
2 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
internal/backends/winit/accesskit.rs
View file

@ -221,6 +221,18 @@ struct NodeCollection {
}
impl NodeCollection {
fn accessible_parent_for_item_rc(&self, mut item: ItemRc) -> ItemRc {
while !item.is_accessible() {
if let Some(parent) = item.parent_item() {
item = parent;
} else {
break;
}
}
item
}
fn focus_node(&self, window_adapter_weak: &Weak<WinitWindowAdapter>) -> NodeId {
window_adapter_weak
.upgrade()
@ -233,6 +245,16 @@ impl NodeCollection {
.focus_item
.borrow()
.upgrade()
.map(|focus_item| {
let parent = self.accessible_parent_for_item_rc(focus_item);
parent
.accessible_string_property(AccessibleStringProperty::DelegateFocus)
.and_then(|s| s.parse::<usize>().ok())
.and_then(|i| {
i_slint_core::accessibility::accessible_descendents(&parent).nth(i)
})
.unwrap_or(parent)
})
.or_else(|| {
window_inner
.try_component()
@ -251,13 +273,7 @@ impl NodeCollection {
}
fn find_node_id_by_item_rc(&self, mut item: ItemRc) -> Option<NodeId> {
while !item.is_accessible() {
if let Some(parent) = item.parent_item() {
item = parent;
} else {
break;
}
}
item = self.accessible_parent_for_item_rc(item);
self.encode_item_node_id(&item)
}

2
internal/compiler/widgets/common/listview.slint
View file

@ -33,6 +33,8 @@ component StandardListViewBase inherits ListView {
private property <length> current-item-y: root.item-y(root.focus-item);
private property <int> focus-item: 0;
accessible-delegate-focus: root.focus-item;
pure function first-visible-item() -> int {
return min(root.model.length - 1, max(0, round(-root.viewport-y / root.item-height)));
}