jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0a0bbe5fdad38ef4411ce18bd26dad9a81238e93
commit 0a0bbe5fdad38ef4411ce18bd26dad9a81238e93
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Thu Aug 24 15:31:05 2017 +0900
widget: Rename hook "access" (EO)
This is also another protected and beta API. Meant to be overridden by
subclasses, but belongs to a still unstable API.
The difference between the internal legacy and the EO API is really bad.
Same as with activate (previous commit).
Ref T5363
---
src/lib/elementary/elc_multibuttonentry.c | 3 ++-
src/lib/elementary/elc_naviframe.c | 3 ++-
src/lib/elementary/elc_popup.c | 3 ++-
src/lib/elementary/elm_bubble.c | 3 ++-
src/lib/elementary/elm_bubble.eo | 2 +-
src/lib/elementary/elm_calendar.c | 3 ++-
src/lib/elementary/elm_calendar.eo | 2 +-
src/lib/elementary/elm_clock.c | 3 ++-
src/lib/elementary/elm_clock.eo | 2 +-
src/lib/elementary/elm_colorselector.c | 3 ++-
src/lib/elementary/elm_colorselector.eo | 2 +-
src/lib/elementary/elm_diskselector.c | 3 ++-
src/lib/elementary/elm_diskselector.eo | 2 +-
src/lib/elementary/elm_gengrid.c | 3 ++-
src/lib/elementary/elm_gengrid.eo | 2 +-
src/lib/elementary/elm_genlist.c | 3 ++-
src/lib/elementary/elm_genlist.eo | 2 +-
src/lib/elementary/elm_index.c | 5 ++--
src/lib/elementary/elm_index.eo | 2 +-
src/lib/elementary/elm_list.c | 3 ++-
src/lib/elementary/elm_list.eo | 2 +-
src/lib/elementary/elm_multibuttonentry.eo | 2 +-
src/lib/elementary/elm_naviframe.eo | 2 +-
src/lib/elementary/elm_panel.c | 3 ++-
src/lib/elementary/elm_panel.eo | 2 +-
src/lib/elementary/elm_popup.eo | 2 +-
src/lib/elementary/elm_segment_control.c | 5 ++--
src/lib/elementary/elm_segment_control.eo | 2 +-
src/lib/elementary/elm_spinner.c | 3 ++-
src/lib/elementary/elm_spinner.eo | 2 +-
src/lib/elementary/elm_toolbar.c | 3 ++-
src/lib/elementary/elm_toolbar.eo | 2 +-
src/lib/elementary/elm_widget.c | 8 +++---
src/lib/elementary/elm_widget.eo | 42 ++++++++++++++++--------------
34 files changed, 76 insertions(+), 58 deletions(-)
diff --git a/src/lib/elementary/elc_multibuttonentry.c
b/src/lib/elementary/elc_multibuttonentry.c
index f9244f37d7..e86f25c669 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -5,6 +5,7 @@
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
#define ELM_WIDGET_ITEM_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
+#define ELM_WIDGET_BETA
#include <Elementary.h>
#include "elm_priv.h"
@@ -1745,7 +1746,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
}
EOLIAN static void
-_elm_multibuttonentry_elm_widget_access(Eo *obj, Elm_Multibuttonentry_Data *sd
EINA_UNUSED, Eina_Bool acs)
+_elm_multibuttonentry_elm_widget_on_access_update(Eo *obj,
Elm_Multibuttonentry_Data *sd EINA_UNUSED, Eina_Bool acs)
{
_elm_multibuttonentry_smart_focus_next_enable = acs;
_access_obj_process(obj, _elm_multibuttonentry_smart_focus_next_enable);
diff --git a/src/lib/elementary/elc_naviframe.c
b/src/lib/elementary/elc_naviframe.c
index 16d7f5ef3e..4897d45ddc 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -6,6 +6,7 @@
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
#define ELM_WIDGET_ITEM_PROTECTED
#define ELM_WIDGET_PROTECTED
+#define ELM_WIDGET_BETA
#include <Elementary.h>
#include "elm_priv.h"
@@ -1570,7 +1571,7 @@ _key_action_item_pop(Evas_Object *obj, const char *params
EINA_UNUSED)
}
EOLIAN static void
-_elm_naviframe_elm_widget_access(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd,
Eina_Bool is_access)
+_elm_naviframe_elm_widget_on_access_update(Eo *obj EINA_UNUSED,
Elm_Naviframe_Data *sd, Eina_Bool is_access)
{
Elm_Naviframe_Item_Data *it;
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 8819df0f7c..778312c7e7 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -6,6 +6,7 @@
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
#define ELM_WIDGET_PROTECTED
#define ELM_WIDGET_ITEM_PROTECTED
+#define ELM_WIDGET_BETA
#include <Elementary.h>
#include "elm_priv.h"
@@ -1611,7 +1612,7 @@ _elm_popup_elm_widget_widget_parent_set(Eo *obj,
Elm_Popup_Data *sd, Evas_Object
}
EOLIAN static void
-_elm_popup_elm_widget_access(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED,
Eina_Bool is_access)
+_elm_popup_elm_widget_on_access_update(Eo *obj, Elm_Popup_Data *_pd
EINA_UNUSED, Eina_Bool is_access)
{
_access_obj_process(obj, is_access);
}
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index 0e2455f926..fcb8bb6f4c 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -4,6 +4,7 @@
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
#define ELM_LAYOUT_PROTECTED
+#define ELM_WIDGET_BETA
#include <Elementary.h>
#include "elm_priv.h"
@@ -211,7 +212,7 @@ _elm_bubble_efl_canvas_group_group_add(Eo *obj,
Elm_Bubble_Data *priv)
}
EOLIAN static void
-_elm_bubble_elm_widget_access(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED,
Eina_Bool is_access)
+_elm_bubble_elm_widget_on_access_update(Eo *obj, Elm_Bubble_Data *_pd
EINA_UNUSED, Eina_Bool is_access)
{
ELM_BUBBLE_CHECK(obj);
diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo
index 5bf8644648..fe297a718b 100644
--- a/src/lib/elementary/elm_bubble.eo
+++ b/src/lib/elementary/elm_bubble.eo
@@ -42,7 +42,7 @@ class Elm.Bubble (Efl.Ui.Layout, Efl.Ui.Clickable)
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
Elm.Widget.focus_direction_manager_is;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Efl.Part.part;
}
}
diff --git a/src/lib/elementary/elm_calendar.c
b/src/lib/elementary/elm_calendar.c
index f346c4661b..06e142b21f 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -4,6 +4,7 @@
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
+#define ELM_WIDGET_BETA
#include <Elementary.h>
#include "elm_priv.h"
@@ -1890,7 +1891,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
}
EOLIAN static void
-_elm_calendar_elm_widget_access(Eo *obj EINA_UNUSED, Elm_Calendar_Data *_pd
EINA_UNUSED, Eina_Bool acs)
+_elm_calendar_elm_widget_on_access_update(Eo *obj EINA_UNUSED,
Elm_Calendar_Data *_pd EINA_UNUSED, Eina_Bool acs)
{
_elm_calendar_smart_focus_next_enable = acs;
_access_obj_process(obj, _elm_calendar_smart_focus_next_enable);
diff --git a/src/lib/elementary/elm_calendar.eo
b/src/lib/elementary/elm_calendar.eo
index 542ee3fce1..0fd61da281 100644
--- a/src/lib/elementary/elm_calendar.eo
+++ b/src/lib/elementary/elm_calendar.eo
@@ -415,7 +415,7 @@ class Elm.Calendar (Efl.Ui.Layout,
Elm.Interface.Atspi_Widget_Action)
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Elm.Widget.focus_next;
Elm.Widget.on_focus;
Elm.Widget.widget_event;
diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c
index 2486cb075c..c0ae68220f 100644
--- a/src/lib/elementary/elm_clock.c
+++ b/src/lib/elementary/elm_clock.c
@@ -3,6 +3,7 @@
#endif
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define ELM_WIDGET_BETA
#include <Elementary.h>
#include "elm_priv.h"
@@ -780,7 +781,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
}
EOLIAN static void
-_elm_clock_elm_widget_access(Eo *obj EINA_UNUSED, Elm_Clock_Data *_pd
EINA_UNUSED, Eina_Bool acs)
+_elm_clock_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Clock_Data
*_pd EINA_UNUSED, Eina_Bool acs)
{
_elm_clock_smart_focus_next_enable = acs;
_access_obj_process(obj, _elm_clock_smart_focus_next_enable);
diff --git a/src/lib/elementary/elm_clock.eo b/src/lib/elementary/elm_clock.eo
index ad445163b9..76b6ef45ae 100644
--- a/src/lib/elementary/elm_clock.eo
+++ b/src/lib/elementary/elm_clock.eo
@@ -165,7 +165,7 @@ class Elm.Clock (Efl.Ui.Layout)
Efl.Object.constructor;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Elm.Widget.focus_next;
Elm.Widget.theme_apply;
}
diff --git a/src/lib/elementary/elm_colorselector.c
b/src/lib/elementary/elm_colorselector.c
index 0c6ea5a10a..9cd1247e5d 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -5,6 +5,7 @@
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
+#define ELM_WIDGET_BETA
#include <Elementary.h>
#include "elm_priv.h"
@@ -2273,7 +2274,7 @@
_elm_colorselector_elm_widget_focus_highlight_geometry_get(const Eo *obj EINA_UN
}
EOLIAN static void
-_elm_colorselector_elm_widget_access(Eo *obj, Elm_Colorselector_Data *_pd
EINA_UNUSED, Eina_Bool acs)
+_elm_colorselector_elm_widget_on_access_update(Eo *obj, Elm_Colorselector_Data
*_pd EINA_UNUSED, Eina_Bool acs)
{
_elm_colorselector_smart_focus_next_enable = acs;
_access_obj_process(obj, _elm_colorselector_smart_focus_next_enable);
diff --git a/src/lib/elementary/elm_colorselector.eo
b/src/lib/elementary/elm_colorselector.eo
index 9bc1349c87..cf6beafbf5 100644
--- a/src/lib/elementary/elm_colorselector.eo
+++ b/src/lib/elementary/elm_colorselector.eo
@@ -113,7 +113,7 @@ class Elm.Colorselector (Efl.Ui.Layout,
Elm.Interface.Atspi_Widget_Action,
Elm.Widget.focus_next;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.focus_highlight_geometry_get;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Elm.Widget.widget_event;
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
Elm.Interface.Atspi_Accessible.children { get; }
diff --git a/src/lib/elementary/elm_diskselector.c
b/src/lib/elementary/elm_diskselector.c
index 7563c05d8b..3dd23818dd 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -5,6 +5,7 @@
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
#define ELM_WIDGET_ITEM_PROTECTED
+#define ELM_WIDGET_BETA
#include <Elementary.h>
#include "elm_priv.h"
@@ -1432,7 +1433,7 @@ _elm_diskselector_efl_canvas_group_group_member_add(Eo
*obj, Elm_Diskselector_Da
}
EOLIAN static void
-_elm_diskselector_elm_widget_access(Eo *obj EINA_UNUSED, Elm_Diskselector_Data
*_pd EINA_UNUSED, Eina_Bool acs)
+_elm_diskselector_elm_widget_on_access_update(Eo *obj EINA_UNUSED,
Elm_Diskselector_Data *_pd EINA_UNUSED, Eina_Bool acs)
{
_elm_diskselector_smart_focus_next_enable = acs;
}
diff --git a/src/lib/elementary/elm_diskselector.eo
b/src/lib/elementary/elm_diskselector.eo
index 9cf2be91e1..7a6fa6b490 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -202,7 +202,7 @@ class Elm.Diskselector (Elm.Widget,
Elm.Interface_Scrollable,
Efl.Gfx.size { set; }
Efl.Canvas.Group.group_member_add;
Elm.Widget.focus_next_manager_is;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Elm.Widget.focus_next;
Elm.Widget.theme_apply;
Elm.Widget.on_focus;
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 98c0caa0f0..b0cbbb25dc 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -6,6 +6,7 @@
#define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
#define ELM_WIDGET_ITEM_PROTECTED
+#define ELM_WIDGET_BETA
#include <Elementary.h>
#include <Elementary_Cursor.h>
@@ -4264,7 +4265,7 @@ _access_obj_process(Elm_Gengrid_Data * sd, Eina_Bool
is_access)
}
EOLIAN static void
-_elm_gengrid_elm_widget_access(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *sd,
Eina_Bool acs)
+_elm_gengrid_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Gengrid_Data
*sd, Eina_Bool acs)
{
_elm_gengrid_smart_focus_next_enable = acs;
_access_obj_process(sd, _elm_gengrid_smart_focus_next_enable);
diff --git a/src/lib/elementary/elm_gengrid.eo
b/src/lib/elementary/elm_gengrid.eo
index 96506b4dfa..2e0bdff78b 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -550,7 +550,7 @@ class Elm.Gengrid (Efl.Ui.Layout, Elm.Interface_Scrollable,
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Elm.Widget.focus_next;
Elm.Widget.focus_direction;
Elm.Widget.on_focus;
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index b6e708e058..e57cc82c3e 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -8,6 +8,7 @@
#define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
#define ELM_WIDGET_ITEM_PROTECTED
+#define ELM_WIDGET_BETA
#include <Elementary.h>
#include <Elementary_Cursor.h>
@@ -5749,7 +5750,7 @@ _access_obj_process(Elm_Genlist_Data *sd, Eina_Bool
is_access)
}
EOLIAN static void
-_elm_genlist_elm_widget_access(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd,
Eina_Bool acs)
+_elm_genlist_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Genlist_Data
*sd, Eina_Bool acs)
{
_elm_genlist_smart_focus_next_enable = acs;
_access_obj_process(sd, _elm_genlist_smart_focus_next_enable);
diff --git a/src/lib/elementary/elm_genlist.eo
b/src/lib/elementary/elm_genlist.eo
index 9740f35a41..86a1f09e7a 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -535,7 +535,7 @@ class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable,
Efl.Ui.Clickable,
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.widget_sub_object_add;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Elm.Widget.focus_highlight_geometry_get;
Elm.Widget.focus_next;
Elm.Widget.on_focus;
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index 2e7244c472..1d077be47e 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -5,8 +5,9 @@
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED
-
#define ELM_WIDGET_ITEM_PROTECTED
+#define ELM_WIDGET_BETA
+
#include <Elementary.h>
#include "elm_priv.h"
@@ -1228,7 +1229,7 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
}
EOLIAN static void
-_elm_index_elm_widget_access(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED,
Eina_Bool acs)
+_elm_index_elm_widget_on_access_update(Eo *obj, Elm_Index_Data *_pd
EINA_UNUSED, Eina_Bool acs)
{
_elm_index_smart_focus_next_enable = acs;
_access_obj_process(obj, _elm_index_smart_focus_next_enable);
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index c67b2d7fa0..2d294f55f6 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -200,7 +200,7 @@ class Elm.Index (Efl.Ui.Layout, Efl.Ui.Direction,
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Elm.Widget.focus_next;
Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and
$horizontal. Default is $vertical.]] }
Elm.Interface.Atspi_Accessible.children { get; }
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 05323969f5..81e5733d38 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -6,6 +6,7 @@
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
#define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
#define ELM_WIDGET_ITEM_PROTECTED
+#define ELM_WIDGET_BETA
#include <Elementary.h>
@@ -2523,7 +2524,7 @@ _elm_list_efl_canvas_group_group_member_add(Eo *obj,
Elm_List_Data *sd, Evas_Obj
}
EOLIAN static void
-_elm_list_elm_widget_access(Eo *obj EINA_UNUSED, Elm_List_Data *sd, Eina_Bool
acs)
+_elm_list_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_List_Data *sd,
Eina_Bool acs)
{
Eina_List *elist = NULL;
Elm_Object_Item *eo_it;
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index 2db4e0bb2d..452beff3ac 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -436,7 +436,7 @@ class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Elm.Widget.focus_highlight_geometry_get;
Elm.Widget.focus_next;
Elm.Widget.on_disabled_update;
diff --git a/src/lib/elementary/elm_multibuttonentry.eo
b/src/lib/elementary/elm_multibuttonentry.eo
index 40d4e727f9..a0358b0ca6 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -181,7 +181,7 @@ class Elm.Multibuttonentry (Efl.Ui.Layout)
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Elm.Widget.focus_direction;
Elm.Widget.focus_next;
Elm.Widget.on_focus;
diff --git a/src/lib/elementary/elm_naviframe.eo
b/src/lib/elementary/elm_naviframe.eo
index 18974b2749..f526919c00 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -147,7 +147,7 @@ class Elm.Naviframe (Efl.Ui.Layout,
Elm.Interface.Atspi_Widget_Action)
Elm.Widget.focus_direction;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Elm.Widget.focus_next;
Elm.Widget.translate;
Elm.Widget.theme_apply;
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index be7135c246..a890902878 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -4,6 +4,7 @@
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
+#define ELM_WIDGET_BETA
#include <Elementary.h>
@@ -990,7 +991,7 @@ _elm_panel_efl_canvas_group_group_member_add(Eo *obj,
Elm_Panel_Data *sd, Evas_O
}
EOLIAN static void
-_elm_panel_elm_widget_access(Eo *obj, Elm_Panel_Data *_pd, Eina_Bool is_access)
+_elm_panel_elm_widget_on_access_update(Eo *obj, Elm_Panel_Data *_pd, Eina_Bool
is_access)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Elm_Panel_Data *sd = _pd;
diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo
index 829a1fcdd5..2b03f95b39 100644
--- a/src/lib/elementary/elm_panel.eo
+++ b/src/lib/elementary/elm_panel.eo
@@ -83,7 +83,7 @@ class Elm.Panel (Efl.Ui.Layout, Elm.Interface_Scrollable,
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
Elm.Widget.on_disabled_update;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Elm.Widget.widget_event;
Elm.Widget.on_focus_region;
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index 8592d8cde3..8023d62571 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -172,7 +172,7 @@ class Elm.Popup (Efl.Ui.Layout,
Elm.Interface.Atspi_Widget_Action)
Elm.Widget.focus_next_manager_is;
Elm.Widget.theme_apply;
Elm.Widget.focus_direction_manager_is;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Elm.Widget.focus_next;
Elm.Widget.widget_parent { set; }
Elm.Widget.translate;
diff --git a/src/lib/elementary/elm_segment_control.c
b/src/lib/elementary/elm_segment_control.c
index 01dc0d18c6..c472e5e39d 100644
--- a/src/lib/elementary/elm_segment_control.c
+++ b/src/lib/elementary/elm_segment_control.c
@@ -3,8 +3,9 @@
#endif
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
-
#define ELM_WIDGET_ITEM_PROTECTED
+#define ELM_WIDGET_BETA
+
#include <Elementary.h>
#include "elm_priv.h"
@@ -692,7 +693,7 @@ _access_obj_process(Elm_Segment_Control_Data *sd, Eina_Bool
is_access)
}
EOLIAN static void
-_elm_segment_control_elm_widget_access(Eo *obj EINA_UNUSED,
Elm_Segment_Control_Data *sd, Eina_Bool acs)
+_elm_segment_control_elm_widget_on_access_update(Eo *obj EINA_UNUSED,
Elm_Segment_Control_Data *sd, Eina_Bool acs)
{
_elm_segment_control_smart_focus_next_enable = acs;
_access_obj_process(sd, _elm_segment_control_smart_focus_next_enable);
diff --git a/src/lib/elementary/elm_segment_control.eo
b/src/lib/elementary/elm_segment_control.eo
index ef43cc12fb..36016d7e39 100644
--- a/src/lib/elementary/elm_segment_control.eo
+++ b/src/lib/elementary/elm_segment_control.eo
@@ -140,7 +140,7 @@ class Elm.Segment_Control (Efl.Ui.Layout)
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
Elm.Widget.focus_direction_manager_is;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Elm.Widget.on_disabled_update;
Elm.Widget.translate;
}
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index 00e7bcdc4a..2c00ad3b61 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -5,6 +5,7 @@
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
+#define ELM_WIDGET_BETA
#include <Elementary.h>
#include <ctype.h>
@@ -1404,7 +1405,7 @@ _elm_spinner_elm_widget_focus_next(Eo *obj,
Elm_Spinner_Data *_pd, Elm_Focus_Dir
}
EOLIAN static void
-_elm_spinner_elm_widget_access(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED,
Eina_Bool acs)
+_elm_spinner_elm_widget_on_access_update(Eo *obj, Elm_Spinner_Data *_pd
EINA_UNUSED, Eina_Bool acs)
{
_elm_spinner_smart_focus_next_enable = acs;
_access_spinner_register(obj, _elm_spinner_smart_focus_next_enable);
diff --git a/src/lib/elementary/elm_spinner.eo
b/src/lib/elementary/elm_spinner.eo
index 95614a3ad8..69d121474e 100644
--- a/src/lib/elementary/elm_spinner.eo
+++ b/src/lib/elementary/elm_spinner.eo
@@ -149,7 +149,7 @@ class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Spin,
Elm.Widget.theme_apply;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Elm.Widget.focus_next;
Elm.Widget.focus_direction;
Elm.Widget.on_focus;
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 4d4c1d0c36..852fc6251f 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -6,6 +6,7 @@
#define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
#define ELM_WIDGET_ITEM_PROTECTED
+#define ELM_WIDGET_BETA
#include <Elementary.h>
@@ -3001,7 +3002,7 @@ _access_obj_process(Elm_Toolbar_Data * sd, Eina_Bool
is_access)
}
EOLIAN static void
-_elm_toolbar_elm_widget_access(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd,
Eina_Bool acs)
+_elm_toolbar_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Toolbar_Data
*sd, Eina_Bool acs)
{
_elm_toolbar_smart_focus_next_enable = acs;
_access_obj_process(sd, _elm_toolbar_smart_focus_next_enable);
diff --git a/src/lib/elementary/elm_toolbar.eo
b/src/lib/elementary/elm_toolbar.eo
index e70fee6177..133fa69699 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -321,7 +321,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable,
Efl.Ui.Direction,
Efl.Canvas.Group.group_calculate;
Efl.Canvas.Group.group_member_add;
Elm.Widget.focus_next_manager_is;
- Elm.Widget.access;
+ Elm.Widget.on_access_update;
Elm.Widget.focus_next;
Elm.Widget.theme_apply;
Elm.Widget.on_focus;
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 02b9635740..68b88bf7a0 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -1176,14 +1176,14 @@ elm_widget_access(Evas_Object *obj,
ret &= elm_widget_access(child, is_access);
}
- elm_obj_widget_access(obj, is_access);
+ elm_obj_widget_on_access_update(obj, is_access);
efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_ACCESS_CHANGED, NULL);
return ret;
}
EOLIAN static void
-_elm_widget_access(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd
EINA_UNUSED, Eina_Bool is_access EINA_UNUSED)
+_elm_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd
EINA_UNUSED, Eina_Bool is_access EINA_UNUSED)
{
}
@@ -3901,9 +3901,7 @@ _elm_widget_focus_reconfigure(Eo *obj,
Elm_Widget_Smart_Data *_pd EINA_UNUSED)
EOLIAN static void
_elm_widget_access_info_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd,
const char *txt)
{
- eina_stringshare_del(sd->access_info);
- if (!txt) sd->access_info = NULL;
- else sd->access_info = eina_stringshare_add(txt);
+ eina_stringshare_replace(&sd->access_info, txt);
}
EOLIAN static const char*
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 0e3b350d20..e9e760189a 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -246,6 +246,29 @@ abstract Elm.Widget (Efl.Canvas.Group,
Elm.Interface.Atspi_Accessible,
txt: string @nullable; [[Accessibility text description]]
}
}
+ on_access_activate @protected @beta {
+ [[Hook function called when widget is activated through accessibility.
+
+ This meant to be overridden by subclasses to support accessibility.
+ This is an unstable API.
+ ]]
+ params {
+ @in act: Elm.Activate; [[Type of activation.]]
+ }
+ return: bool; [[$true on success, $false otherwise]]
+ legacy: null; /* FIXME: legacy API does extra work */
+ }
+ on_access_update @protected @beta {
+ [[Hook function called when accessibility is changed on the widget.
+
+ This meant to be overridden by subclasses to support accessibility.
+ This is an unstable API.
+ ]]
+ params {
+ @in enable: bool; [[$true if accessibility is enabled.]]
+ }
+ legacy: null; /* FIXME: legacy API does extra work */
+ }
/* Drag API */
@property drag_lock_x {
@@ -400,25 +423,6 @@ abstract Elm.Widget (Efl.Canvas.Group,
Elm.Interface.Atspi_Accessible,
return: Efl.Ui.Theme.Apply; [[Indicates success, and if the current
theme or default theme was used.]]
}
- on_access_activate @protected @beta {
- [[Hook function called when widget is activated through accessibility.
-
- This meant to be overridden by subclasses to support accessibility.
- This is an unstable API.
- ]]
- params {
- @in act: Elm.Activate; [[Type of activation.]]
- }
- return: bool; [[$true on success, $false otherwise]]
- legacy: null; /* the legacy API has not the same number of parameter
to we don't generate it. */
- }
- access {
- [['Virtual' function on the widget being set access.]]
- params {
- @in acs: bool; [[$true if access is set, $false otherwise]]
- }
- legacy: null;
- }
on_focus {
[['Virtual' function handling focus in/out events on the widget]]
params {
--
