[ctxpopup, hoversel]

 - do not show highlight frame for outline
 - do not read outline information by 1 finger swipe

Change-Id: I37c2b022a0d066c891f4f96a1e2005913b194db3

diff --git a/src/flat_navi.c b/src/flat_navi.c
index 1ee871318cb4d4e4ab729b0670709c50d339342b..e3b1de9a86e975802755b04bbf3ea5aa6a816ba2 100644 (file)
--- a/src/flat_navi.c
+++ b/src/flat_navi.c
@@ -479,14 +479,15 @@ AtspiAccessible *_directional_depth_first_search(AtspiAccessible * root, AtspiAc
                // 2. internal nodes of flow relation chains
                // 3. parent before children in backward traversing
                // 4. If page tab list being returned as not a first object
+               // 5. If ctxpopup, hoversel (ATSPI_ROLE_POPUP_MENU) being returned as not a first object
                role = atspi_accessible_get_role(node, NULL);
                if (node != start && (relation_mode || !prev_related_in_direction) && !(cc > 0 && next_sibling_idx_modifier < 0 && !all_children_visited) && stop_condition(node))
                {
-                       if (role == ATSPI_ROLE_PAGE_TAB)
+                       if (role == ATSPI_ROLE_PAGE_TAB || role == ATSPI_ROLE_POPUP_MENU)
                        {
                                if (start == NULL)
                                {
-                                       DEBUG("next_sibling_idx_modifier == 1 && role == ATSPI_ROLE_PAGE_TAB");
+                                       DEBUG("next_sibling_idx_modifier == 1 && (role == ATSPI_ROLE_PAGE_TAB || ATSPI_ROLE_POPUP_MENU)");
                                        g_object_unref(prev_related_in_direction);
                                        return node;
                                }

diff --git a/src/navigator.c b/src/navigator.c
index d33d55cc651e43a4988fcd60e554aa5a92e52732..a6e1123ad4885643d297e4ba5882c258b9a2c875 100755 (executable)
--- a/src/navigator.c
+++ b/src/navigator.c
@@ -962,7 +962,7 @@ static void _current_highlight_object_set(AtspiAccessible * obj)
                        haptic_vibrate_start(HAPTIC_VIBRATE_DURATION, HAPTIC_VIBRATE_INTENSITY);
 
                role = atspi_accessible_get_role(obj, NULL);
-               if (role != ATSPI_ROLE_PAGE_TAB) {
+               if (role != ATSPI_ROLE_PAGE_TAB && role != ATSPI_ROLE_POPUP_MENU) { /* ctxpopup outline does not show highlight frame */
                        atspi_component_grab_highlight(comp, &err);
                }
                current_comp = comp;