summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinwoo Kim <cinoo.kim@samsung.com>2017-08-01 19:52:38 +0900
committerShinwoo Kim <cinoo.kim@samsung.com>2017-08-01 19:52:38 +0900
commit391a777c0164c118e5b7de846f9ad8835f50794a (patch)
treebcd403c8ddc880f5ed2c1ef6cb46eeee09119f58
parentfd52344b0312b5309561f40a49b971bda6f9e42d (diff)
elementary: access overrides Accessible.state_set.get
The elm_access a widget makes primitive object accessible. If a primitive object is not visible, then the elm_access should NOT have state VISIBLE, and SHOWING. From now the elm_access is checking visibility of primitive object.
-rw-r--r--src/lib/elementary/elm_access.c17
-rw-r--r--src/lib/elementary/elm_access.eo1
2 files changed, 18 insertions, 0 deletions
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index 824ae090ca..88d06bed59 100644
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -2,6 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
5#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
6 7
7#include <Elementary.h> 8#include <Elementary.h>
@@ -1507,6 +1508,22 @@ _elm_access_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE
1507 return &atspi_actions[0]; 1508 return &atspi_actions[0];
1508} 1509}
1509 1510
1511EOLIAN static Elm_Atspi_State_Set
1512_elm_access_elm_interface_atspi_accessible_state_set_get(Eo *obj, void *pd EINA_UNUSED)
1513{
1514 Elm_Atspi_State_Set ret;
1515 ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_ACCESS_CLASS));
1516
1517 Elm_Access_Info *info = _elm_access_info_get(obj);
1518 if (info && !evas_object_visible_get(info->part_object))
1519 {
1520 STATE_TYPE_UNSET(ret, ELM_ATSPI_STATE_VISIBLE);
1521 STATE_TYPE_UNSET(ret, ELM_ATSPI_STATE_SHOWING);
1522 }
1523
1524 return ret;
1525}
1526
1510/* Internal EO APIs and hidden overrides */ 1527/* Internal EO APIs and hidden overrides */
1511 1528
1512#define ELM_ACCESS_EXTRA_OPS \ 1529#define ELM_ACCESS_EXTRA_OPS \
diff --git a/src/lib/elementary/elm_access.eo b/src/lib/elementary/elm_access.eo
index fac266785f..5c8fb31823 100644
--- a/src/lib/elementary/elm_access.eo
+++ b/src/lib/elementary/elm_access.eo
@@ -10,5 +10,6 @@ class Elm.Access (Elm.Widget, Elm.Interface.Atspi_Widget_Action)
10 Elm.Widget.activate; 10 Elm.Widget.activate;
11 Elm.Widget.on_focus; 11 Elm.Widget.on_focus;
12 Elm.Interface.Atspi_Widget_Action.elm_actions { get; } 12 Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
13 Elm.Interface.Atspi_Accessible.state_set { get; }
13 } 14 }
14} 15}