fix: Return to handling focus events directly, after generic node cha…

…nges (#409)
AccessKit · May 13, 2024 · cd2e35e · cd2e35e
1 parent 2f8155c
commit cd2e35e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/platforms/atspi-common/src/adapter.rs b/platforms/atspi-common/src/adapter.rs
@@ -104,6 +104,14 @@ impl TreeChangeHandler for AdapterChangeHandler<'_> {
                 self.adapter.window_deactivated(&NodeWrapper(&root_window));
             }
         }
+        if let Some(node) = new_node {
+            self.adapter
+                .emit_object_event(node.id(), ObjectEvent::StateChanged(State::Focused, true));
+        }
+        if let Some(node) = old_node {
+            self.adapter
+                .emit_object_event(node.id(), ObjectEvent::StateChanged(State::Focused, false));
+        }
     }
 
     fn node_removed(&mut self, node: &Node) {

diff --git a/platforms/atspi-common/src/node.rs b/platforms/atspi-common/src/node.rs
@@ -455,6 +455,10 @@ impl<'a> NodeWrapper<'a> {
         let new_state = self.state(true);
         let changed_states = old_state ^ new_state;
         for state in changed_states.iter() {
+            if state == State::Focused {
+                // This is handled specially in `focus_moved`.
+                continue;
+            }
             adapter.emit_object_event(
                 self.id(),
                 ObjectEvent::StateChanged(state, new_state.contains(state)),