@ -70,6 +70,8 @@ struct ContextImpl {
#[ cfg(feature = " accesskit " ) ] #[ cfg(feature = " accesskit " ) ]
is_accesskit_enabled : bool , is_accesskit_enabled : bool ,
#[ cfg(feature = " accesskit " ) ]
accesskit_node_classes : accesskit ::NodeClassSet ,
} }
impl ContextImpl { impl ContextImpl {
@ -113,17 +115,14 @@ impl ContextImpl {
if self . is_accesskit_enabled { if self . is_accesskit_enabled {
use crate ::frame_state ::AccessKitFrameState ; use crate ::frame_state ::AccessKitFrameState ;
let id = crate ::accesskit_root_id ( ) ; let id = crate ::accesskit_root_id ( ) ;
let node = Box ::new ( accesskit ::Node { let mut builder = accesskit ::NodeBuilder ::new ( accesskit ::Role ::Window ) ;
role : accesskit ::Role ::Window , builder . set_transform ( accesskit ::Affine ::scale (
transform : Some ( self . input . pixels_per_point ( ) . into ( ) ,
accesskit ::kurbo ::Affine ::scale ( self . input . pixels_per_point ( ) . into ( ) ) . into ( ) , ) ) ;
) , let mut node_builders = IdMap ::default ( ) ;
. . Default ::default ( ) node_builders . insert ( id , builder ) ;
} ) ;
let mut nodes = IdMap ::default ( ) ;
nodes . insert ( id , node ) ;
self . frame_state . accesskit_state = Some ( AccessKitFrameState { self . frame_state . accesskit_state = Some ( AccessKitFrameState {
nodes , node_builders ,
parent_stack : vec ! [ id ] , parent_stack : vec ! [ id ] ,
} ) ; } ) ;
} }
@ -156,16 +155,16 @@ impl ContextImpl {
} }
#[ cfg(feature = " accesskit " ) ] #[ cfg(feature = " accesskit " ) ]
fn accesskit_node ( & mut self , id : Id ) -> & mut accesskit ::Node { fn accesskit_node_builder ( & mut self , id : Id ) -> & mut accesskit ::NodeBuilder {
let state = self . frame_state . accesskit_state . as_mut ( ) . unwrap ( ) ; let state = self . frame_state . accesskit_state . as_mut ( ) . unwrap ( ) ;
let node s = & mut state . nodes ; let builder s = & mut state . node_builder s ;
if let std ::collections ::hash_map ::Entry ::Vacant ( entry ) = node s. entry ( id ) { if let std ::collections ::hash_map ::Entry ::Vacant ( entry ) = builder s. entry ( id ) {
entry . insert ( Default ::default ( ) ) ; entry . insert ( Default ::default ( ) ) ;
let parent_id = state . parent_stack . last ( ) . unwrap ( ) ; let parent_id = state . parent_stack . last ( ) . unwrap ( ) ;
let parent = node s. get_mut ( parent_id ) . unwrap ( ) ; let parent_builder = builder s. get_mut ( parent_id ) . unwrap ( ) ;
parent . children . push ( id . accesskit_id ( ) ) ; parent_builder . push_child ( id . accesskit_id ( ) ) ;
} }
node s. get_mut ( & id ) . unwrap ( ) builder s. get_mut ( & id ) . unwrap ( )
} }
} }
@ -655,7 +654,7 @@ impl Context {
// Make sure anything that can receive focus has an AccessKit node.
// Make sure anything that can receive focus has an AccessKit node.
// TODO(mwcampbell): For nodes that are filled from widget info,
// TODO(mwcampbell): For nodes that are filled from widget info,
// some information is written to the node twice.
// some information is written to the node twice.
self . accesskit_node ( id , | node | response . fill_accesskit_node_common ( node ) ) ; self . accesskit_node_builder ( id , | builder | response . fill_accesskit_node_common ( builder ) ) ;
} }
let clicked_elsewhere = response . clicked_elsewhere ( ) ; let clicked_elsewhere = response . clicked_elsewhere ( ) ;
@ -1128,12 +1127,20 @@ impl Context {
if let Some ( state ) = state { if let Some ( state ) = state {
let has_focus = self . input ( | i | i . raw . has_focus ) ; let has_focus = self . input ( | i | i . raw . has_focus ) ;
let root_id = crate ::accesskit_root_id ( ) . accesskit_id ( ) ; let root_id = crate ::accesskit_root_id ( ) . accesskit_id ( ) ;
platform_output . accesskit_update = Some ( accesskit ::TreeUpdate { let nodes = self . write ( | ctx | {
nodes : state state
. nodes . node_builder s
. into_iter ( ) . into_iter ( )
. map ( | ( id , node ) | ( id . accesskit_id ( ) , Arc ::from ( node ) ) ) . map ( | ( id , builder ) | {
. collect ( ) , (
id . accesskit_id ( ) ,
builder . build ( & mut ctx . accesskit_node_classes ) ,
)
} )
. collect ( )
} ) ;
platform_output . accesskit_update = Some ( accesskit ::TreeUpdate {
nodes ,
tree : Some ( accesskit ::Tree ::new ( root_id ) ) , tree : Some ( accesskit ::Tree ::new ( root_id ) ) ,
focus : has_focus . then ( | | { focus : has_focus . then ( | | {
let focus_id = self . memory ( | mem | mem . interaction . focus . id ) ; let focus_id = self . memory ( | mem | mem . interaction . focus . id ) ;
@ -1720,8 +1727,8 @@ impl Context {
} }
/// If AccessKit support is active for the current frame, get or create
/// If AccessKit support is active for the current frame, get or create
/// a node with the specified ID and return a mutable reference to it.
/// a node builder with the specified ID and return a mutable reference to it.
/// For newly crated nodes, the parent is the node with the ID at the top
/// For newly cre ated nodes, the parent is the node with the ID at the top
/// of the stack managed by [`Context::with_accessibility_parent`].
/// of the stack managed by [`Context::with_accessibility_parent`].
///
///
/// The `Context` lock is held while the given closure is called!
/// The `Context` lock is held while the given closure is called!
@ -1729,16 +1736,16 @@ impl Context {
/// Returns `None` if acesskit is off.
/// Returns `None` if acesskit is off.
// TODO: consider making both RO and RW versions
// TODO: consider making both RO and RW versions
#[ cfg(feature = " accesskit " ) ] #[ cfg(feature = " accesskit " ) ]
pub fn accesskit_node < R > ( pub fn accesskit_node_builder < R > (
& self , & self ,
id : Id , id : Id ,
writer : impl FnOnce ( & mut accesskit ::Node ) -> R , writer : impl FnOnce ( & mut accesskit ::NodeBuilder ) -> R ,
) -> Option < R > { ) -> Option < R > {
self . write ( | ctx | { self . write ( | ctx | {
ctx . frame_state ctx . frame_state
. accesskit_state . accesskit_state
. is_some ( ) . is_some ( )
. then ( | | ctx . accesskit_node ( id ) ) . then ( | | ctx . accesskit_node_builder ( id ) )
. map ( writer ) . map ( writer )
} ) } )
} }
@ -1750,12 +1757,30 @@ impl Context {
/// being called by the AccessKit adapter to provide the initial tree update,
/// being called by the AccessKit adapter to provide the initial tree update,
/// then it should do so, to provide a complete AccessKit tree to the adapter
/// then it should do so, to provide a complete AccessKit tree to the adapter
/// immediately. Otherwise, it should enqueue a repaint and use the
/// immediately. Otherwise, it should enqueue a repaint and use the
/// placeholder tree update from [`crate ::accesskit_placeholder_tree_update`]
/// placeholder tree update from [`Context ::accesskit_placeholder_tree_update`]
/// in the meantime.
/// in the meantime.
#[ cfg(feature = " accesskit " ) ] #[ cfg(feature = " accesskit " ) ]
pub fn enable_accesskit ( & self ) { pub fn enable_accesskit ( & self ) {
self . write ( | ctx | ctx . is_accesskit_enabled = true ) ; self . write ( | ctx | ctx . is_accesskit_enabled = true ) ;
} }
/// Return a tree update that the egui integration should provide to the
/// AccessKit adapter if it cannot immediately run the egui application
/// to get a full tree update after running [`Context::enable_accesskit`].
#[ cfg(feature = " accesskit " ) ]
pub fn accesskit_placeholder_tree_update ( & self ) -> accesskit ::TreeUpdate {
use accesskit ::{ NodeBuilder , Role , Tree , TreeUpdate } ;
let root_id = crate ::accesskit_root_id ( ) . accesskit_id ( ) ;
self . write ( | ctx | TreeUpdate {
nodes : vec ! [ (
root_id ,
NodeBuilder ::new ( Role ::Window ) . build ( & mut ctx . accesskit_node_classes ) ,
) ] ,
tree : Some ( Tree ::new ( root_id ) ) ,
focus : None ,
} )
}
} }
#[ test ] #[ test ]
Matt Campbell
2 years ago
GitHub