fix: nested axmenu

Author: blindFS

src/app_engine/drawing.rs

@@ -46,6 +46,12 @@ impl AppEngine {
         })
     }
 
+    pub(super) fn finalize_hints(&self) {
+        for hb in self.hint_boxes.iter() {
+            hb.refresh(0, &self.overlay_frame, &self.config.theme);
+        }
+    }
+
     /// Show/Hide hint_boxes/colored_frames, update hint text and positions.
     /// Returns indices of visible hint boxes
     pub(super) fn update_hints(&mut self) -> Vec<usize> {

src/app_engine/lifecycle.rs

@@ -157,21 +157,30 @@ impl AppEngine {
         let result_rx = self.ui_element_traverse_on_activation(target);
 
         let mut color_idx = 0;
+        let mut popup_level = 0;
+        let mut no_popup = true;
+
         autoreleasepool(|_| {
             for (idx, signal) in result_rx.iter().enumerate() {
                 match signal {
-                    ElementSignal::ElementFound(Some(ele)) => {
+                    ElementSignal::ElementFound(Some(ele)) if no_popup || popup_level > 0 => {
                         let need_flush = (idx + 1) % Self::HINTBOX_FLUSH_BATCH_SIZE == 0;
                         self.handle_element_found(ele, &mut color_idx, need_flush);
                     }
                     ElementSignal::TraversalFinished(target) => {
                         self.handle_traversal_finished(target);
-                        break;
                     }
-                    ElementSignal::ClearOnPopUp => {
-                        self.element_cache.clear();
-                        self.hint_boxes.iter().for_each(|hb| hb.free());
-                        self.hint_boxes.clear();
+                    ElementSignal::StartPopup => {
+                        if no_popup {
+                            self.hint_boxes.iter().for_each(|hb| hb.free());
+                            self.hint_boxes.clear();
+                            self.element_cache.clear();
+                            no_popup = false;
+                        }
+                        popup_level += 1;
+                    }
+                    ElementSignal::EndPopup => {
+                        popup_level -= 1;
                     }
                     _ => (),
                 }
@@ -245,7 +254,7 @@ impl AppEngine {
         if !self.hint_boxes.is_empty() {
             resolve_collisions(&mut self.hint_boxes, self.hint_width, &self.config.theme);
             // Update layers to match final positions and labels without clearing (avoid flicker)
-            self.update_hints();
+            self.finalize_hints();
 
             if need_help_msg {
                 self.notify("Press Enter to act.", Level::Trace);

src/ax_element.rs

@@ -6,12 +6,11 @@ use accessibility::{AXAttribute, AXUIElement, AXUIElementAttributes};
 use accessibility_sys::{
     AXUIElementCopyMultipleAttributeValues, AXValueCreate, AXValueGetValue, AXValueRef,
     kAXButtonRole, kAXCellRole, kAXCheckBoxRole, kAXComboBoxRole, kAXContentListSubrole,
-    kAXErrorSuccess, kAXGroupRole, kAXHiddenAttribute, kAXImageRole, kAXListRole,
-    kAXMenuButtonRole, kAXMenuItemRole, kAXMenuRole, kAXPopUpButtonRole, kAXPositionAttribute,
-    kAXPressAction, kAXRoleAttribute, kAXRowRole, kAXScrollAreaRole, kAXScrollBarRole,
-    kAXSelectedTextRangeAttribute, kAXSizeAttribute, kAXStaticTextRole, kAXTextAreaRole,
-    kAXTextFieldRole, kAXTitleAttribute, kAXValueTypeCFRange, kAXValueTypeCGPoint,
-    kAXValueTypeCGSize, kAXWindowRole,
+    kAXErrorSuccess, kAXGroupRole, kAXHiddenAttribute, kAXImageRole, kAXListRole, kAXMenuItemRole,
+    kAXMenuRole, kAXPopUpButtonRole, kAXPositionAttribute, kAXPressAction, kAXRoleAttribute,
+    kAXRowRole, kAXScrollAreaRole, kAXScrollBarRole, kAXSelectedTextRangeAttribute,
+    kAXSizeAttribute, kAXStaticTextRole, kAXTextAreaRole, kAXTextFieldRole, kAXTitleAttribute,
+    kAXValueTypeCFRange, kAXValueTypeCGPoint, kAXValueTypeCGSize, kAXWindowRole,
 };
 use core_foundation::{
     array::{CFArray, CFArrayRef},
@@ -35,7 +34,8 @@ pub enum ElementSignal {
     // Traversal
     ElementFound(Option<ElementOfInterest>),
     TraversalFinished(Target),
-    ClearOnPopUp,
+    StartPopup,
+    EndPopup,
 }
 
 fn match_helper(pattern: &str, value: &impl ToString) -> bool {
@@ -834,7 +834,7 @@ fn traverse_elements(
     };
 
     let mut window_frame = *window_frame;
-    let mut finish_early = false;
+    let mut is_popup = false;
 
     #[allow(non_upper_case_globals)]
     match ele_fp.role.as_str() {
@@ -1027,8 +1027,8 @@ fn traverse_elements(
             }
         }
         kAXGroupRole if element.subrole().is_ok_and(|r| r == "AXApplicationDialog") => {
-            let _ = result_tx.send(ElementSignal::ClearOnPopUp);
-            finish_early = true;
+            let _ = result_tx.send(ElementSignal::StartPopup);
+            is_popup = true;
         }
         kAXGroupRole => match target {
             Target::Clickable if element.is_clickable() => {
@@ -1050,14 +1050,9 @@ fn traverse_elements(
             }
             _ => (),
         },
-        kAXMenuRole
-            if element
-                .parent()
-                .and_then(|p| p.role())
-                .is_ok_and(|r| r == kAXMenuButtonRole) =>
-        {
-            let _ = result_tx.send(ElementSignal::ClearOnPopUp);
-            finish_early = true;
+        kAXMenuRole => {
+            let _ = result_tx.send(ElementSignal::StartPopup);
+            is_popup = true;
         }
         kAXMenuItemRole => match target {
             Target::Text => {
@@ -1123,8 +1118,8 @@ fn traverse_elements(
                 depth + 1,
             );
         }
-        if finish_early {
-            let _ = result_tx.send(ElementSignal::TraversalFinished(target.clone()));
+        if is_popup {
+            let _ = result_tx.send(ElementSignal::EndPopup);
         }
     }
 }