summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Stanislawski <l.stanislaws@samsung.com>2015-05-13 15:37:47 +0200
committerLukasz Stanislawski <l.stanislaws@samsung.com>2015-05-13 15:39:24 +0200
commit1e30b5422c2156c2b8efeceb18045d199ef9aaaa (patch)
treeb64f5bb0be85e7d9510eb893a6371c4ec22f33a7
parent020ad4df7b737fa7225b4e98e3ffd78c11de71d6 (diff)
atspi: add ACTIVE state to elm_win
-rw-r--r--src/lib/elm_win.c22
-rw-r--r--src/lib/elm_win.eo1
2 files changed, 21 insertions, 2 deletions
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 556030ed5..c2437355e 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -1044,7 +1044,10 @@ _elm_win_focus_in(Ecore_Evas *ee)
1044 } 1044 }
1045 1045
1046 if (_elm_config->atspi_mode) 1046 if (_elm_config->atspi_mode)
1047 eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_ACTIVATED, NULL)); 1047 {
1048 eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_ACTIVATED, NULL));
1049 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_ACTIVE, EINA_TRUE);
1050 }
1048 1051
1049 /* do nothing */ 1052 /* do nothing */
1050 /* else if (sd->img_obj) */ 1053 /* else if (sd->img_obj) */
@@ -1076,7 +1079,10 @@ _elm_win_focus_out(Ecore_Evas *ee)
1076 _elm_access_object_highlight_disable(evas_object_evas_get(obj)); 1079 _elm_access_object_highlight_disable(evas_object_evas_get(obj));
1077 1080
1078 if (_elm_config->atspi_mode) 1081 if (_elm_config->atspi_mode)
1079 eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL)); 1082 {
1083 eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL));
1084 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_ACTIVE, EINA_FALSE);
1085 }
1080 1086
1081 /* do nothing */ 1087 /* do nothing */
1082 /* if (sd->img_obj) */ 1088 /* if (sd->img_obj) */
@@ -5417,4 +5423,16 @@ _elm_win_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED,
5417 return &atspi_actions[0]; 5423 return &atspi_actions[0];
5418} 5424}
5419 5425
5426EOLIAN static Elm_Atspi_State_Set
5427_elm_win_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Win_Data *sd EINA_UNUSED)
5428{
5429 Elm_Atspi_State_Set ret;
5430 eo_do_super(obj, MY_CLASS, ret = elm_interface_atspi_accessible_state_set_get());
5431
5432 if (elm_win_focus_get(obj))
5433 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_ACTIVE);
5434
5435 return ret;
5436}
5437
5420#include "elm_win.eo.c" 5438#include "elm_win.eo.c"
diff --git a/src/lib/elm_win.eo b/src/lib/elm_win.eo
index 34cc83743..8909e45e3 100644
--- a/src/lib/elm_win.eo
+++ b/src/lib/elm_win.eo
@@ -1620,6 +1620,7 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
1620 Elm.Widget.on_focus; 1620 Elm.Widget.on_focus;
1621 Elm.Widget.event; 1621 Elm.Widget.event;
1622 Elm_Interface_Atspi_Accessible.parent.get; 1622 Elm_Interface_Atspi_Accessible.parent.get;
1623 Elm_Interface_Atspi_Accessible.state_set.get;
1623 Elm_Interface_Atspi_Widget_Action.elm_actions.get; 1624 Elm_Interface_Atspi_Widget_Action.elm_actions.get;
1624 } 1625 }
1625 constructors { 1626 constructors {