jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=20570f74d32d49fe09797f24d5a43348fe39dfda
commit 20570f74d32d49fe09797f24d5a43348fe39dfda
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Fri Jan 19 17:25:47 2018 +0900
widget: Move on_focus_update to Focus.Object
Following @taxi2se's recommendation. This is indeed a focus method, and
Widget already inherits from Focus.Object.
Ping @bu5hm4n who probably wants to adapt this further.
Ref T5363
---
src/lib/elementary/efl_ui_calendar.c | 4 ++--
src/lib/elementary/efl_ui_calendar.eo | 2 +-
src/lib/elementary/efl_ui_clock.c | 4 ++--
src/lib/elementary/efl_ui_clock.eo | 2 +-
src/lib/elementary/efl_ui_focus_object.eo | 5 ++++-
src/lib/elementary/efl_ui_image_zoomable.c | 4 ++--
src/lib/elementary/efl_ui_image_zoomable.eo | 2 +-
src/lib/elementary/efl_ui_layout.c | 4 ++--
src/lib/elementary/efl_ui_layout.eo | 2 +-
src/lib/elementary/efl_ui_slider.c | 4 ++--
src/lib/elementary/efl_ui_slider.eo | 2 +-
src/lib/elementary/efl_ui_spin_button.c | 4 ++--
src/lib/elementary/efl_ui_spin_button.eo | 2 +-
src/lib/elementary/efl_ui_text.c | 2 +-
src/lib/elementary/efl_ui_text.eo | 2 +-
src/lib/elementary/efl_ui_widget.c | 6 +++---
src/lib/elementary/efl_ui_widget.eo | 4 ----
src/lib/elementary/efl_ui_win.c | 4 ++--
src/lib/elementary/efl_ui_win.eo | 2 +-
src/lib/elementary/elementary_config.h | 1 +
src/lib/elementary/elm_access.c | 2 +-
src/lib/elementary/elm_access.eo | 2 +-
src/lib/elementary/elm_calendar.c | 4 ++--
src/lib/elementary/elm_calendar.eo | 2 +-
src/lib/elementary/elm_diskselector.c | 4 ++--
src/lib/elementary/elm_diskselector.eo | 2 +-
src/lib/elementary/elm_entry.c | 2 +-
src/lib/elementary/elm_entry.eo | 2 +-
src/lib/elementary/elm_genlist.c | 4 ++--
src/lib/elementary/elm_genlist.eo | 2 +-
src/lib/elementary/elm_glview.c | 4 ++--
src/lib/elementary/elm_glview.eo | 2 +-
src/lib/elementary/elm_list.c | 4 ++--
src/lib/elementary/elm_list.eo | 2 +-
src/lib/elementary/elm_map.c | 4 ++--
src/lib/elementary/elm_map.eo | 2 +-
src/lib/elementary/elm_plug.c | 4 ++--
src/lib/elementary/elm_plug.eo | 2 +-
src/lib/elementary/elm_spinner.c | 4 ++--
src/lib/elementary/elm_spinner.eo | 2 +-
src/lib/elementary/elm_toolbar.c | 4 ++--
src/lib/elementary/elm_toolbar.eo | 2 +-
42 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/src/lib/elementary/efl_ui_calendar.c
b/src/lib/elementary/efl_ui_calendar.c
index cc2149f73c..e630b1dc22 100644
--- a/src/lib/elementary/efl_ui_calendar.c
+++ b/src/lib/elementary/efl_ui_calendar.c
@@ -863,11 +863,11 @@ _key_action_activate(Evas_Object *obj, const char *params
EINA_UNUSED)
}
EOLIAN static Eina_Bool
-_efl_ui_calendar_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Calendar_Data
*sd)
+_efl_ui_calendar_efl_ui_focus_object_on_focus_update(Eo *obj,
Efl_Ui_Calendar_Data *sd)
{
Eina_Bool int_ret = EINA_FALSE;
- int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
+ int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
// FIXME : Currently, focused item is same with selected item.
diff --git a/src/lib/elementary/efl_ui_calendar.eo
b/src/lib/elementary/efl_ui_calendar.eo
index 088d2e153e..c5df93758f 100644
--- a/src/lib/elementary/efl_ui_calendar.eo
+++ b/src/lib/elementary/efl_ui_calendar.eo
@@ -108,7 +108,7 @@ class Efl.Ui.Calendar (Efl.Ui.Layout,
Efl.Ui.Focus.Composition, Efl.Access.Widge
Efl.Canvas.Group.group_calculate;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_update;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Ui.Format.format_cb { set; }
diff --git a/src/lib/elementary/efl_ui_clock.c
b/src/lib/elementary/efl_ui_clock.c
index 885313a339..e133ee96e5 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -449,11 +449,11 @@ _efl_ui_clock_edit_mode_get(Eo *obj EINA_UNUSED,
Efl_Ui_Clock_Data *sd)
}
EOLIAN static Eina_Bool
-_efl_ui_clock_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd)
+_efl_ui_clock_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Clock_Data
*sd)
{
Eina_Bool int_ret = EINA_FALSE;
- int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
+ int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (!efl_ui_focus_object_focus_get(obj))
diff --git a/src/lib/elementary/efl_ui_clock.eo
b/src/lib/elementary/efl_ui_clock.eo
index 3211962e84..795afd44dd 100644
--- a/src/lib/elementary/efl_ui_clock.eo
+++ b/src/lib/elementary/efl_ui_clock.eo
@@ -226,7 +226,7 @@ class Efl.Ui.Clock (Efl.Ui.Layout)
Efl.Object.constructor;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_disabled_update;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Translatable.translation_update;
}
events {
diff --git a/src/lib/elementary/efl_ui_focus_object.eo
b/src/lib/elementary/efl_ui_focus_object.eo
index 6842dfabc7..a8ce1130b8 100644
--- a/src/lib/elementary/efl_ui_focus_object.eo
+++ b/src/lib/elementary/efl_ui_focus_object.eo
@@ -54,13 +54,16 @@ mixin Efl.Ui.Focus.Object
logical_parent : Efl.Ui.Focus.Object; [[The focus parent.]]
}
}
-
prepare_logical {
[[Tells the object that its children will be queried soon by the
given manager.
Deleting manager items in this call will result in undefied
behaviour and may cause your system to crash.
]]
}
+ on_focus_update @protected @pure_virtual {
+ [[Virtual function handling focus in/out events on the widget]]
+ return: bool; [[$true if this widget can handle focus, $false
otherwise]]
+ }
}
implements {
@empty .focus_geometry;
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c
b/src/lib/elementary/efl_ui_image_zoomable.c
index d4a184e2c7..c3d0f5e2d5 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -863,12 +863,12 @@ _mouse_up_cb(void *data,
}
EOLIAN static Eina_Bool
-_efl_ui_image_zoomable_efl_ui_widget_on_focus_update(Eo *obj,
Efl_Ui_Image_Zoomable_Data *_pd EINA_UNUSED)
+_efl_ui_image_zoomable_efl_ui_focus_object_on_focus_update(Eo *obj,
Efl_Ui_Image_Zoomable_Data *_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
- int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
+ int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))
diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo
b/src/lib/elementary/efl_ui_image_zoomable.eo
index bbe5124552..789457cf07 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -59,7 +59,7 @@ class Efl.Ui.Image_Zoomable (Efl.Ui.Widget, Efl.Ui.Image,
Efl.Ui.Zoom,
Efl.Ui.Zoom.zoom_mode { set; get; }
Efl.Canvas.Group.group_member_add;
Efl.Ui.Widget.theme_apply;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Ui.Scrollable.Interactive.scroll;
Efl.Access.Widget.Action.elm_actions { get; }
diff --git a/src/lib/elementary/efl_ui_layout.c
b/src/lib/elementary/efl_ui_layout.c
index 96d0b09ba7..102077f331 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -393,7 +393,7 @@ _efl_ui_layout_efl_ui_widget_theme_apply(Eo *obj,
Efl_Ui_Layout_Data *sd)
}
EOLIAN static Eina_Bool
-_efl_ui_layout_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd
EINA_UNUSED)
+_efl_ui_layout_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Layout_Data
*_pd EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
@@ -410,7 +410,7 @@ _efl_ui_layout_efl_ui_widget_on_focus_update(Eo *obj,
Efl_Ui_Layout_Data *_pd EI
evas_object_focus_set(wd->resize_obj, EINA_FALSE);
}
- efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
+ efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (efl_isa(wd->resize_obj, EFL_CANVAS_LAYOUT_CLASS))
edje_object_message_signal_process(wd->resize_obj);
diff --git a/src/lib/elementary/efl_ui_layout.eo
b/src/lib/elementary/efl_ui_layout.eo
index 877e3d0bcb..1667b0dbd2 100644
--- a/src/lib/elementary/efl_ui_layout.eo
+++ b/src/lib/elementary/efl_ui_layout.eo
@@ -64,7 +64,7 @@ class Efl.Ui.Layout (Efl.Ui.Widget, Efl.Part, Efl.Container,
Efl.File,
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_disabled_update;
Efl.Ui.Widget.widget_sub_object_del;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Container.content_count;
Efl.Container.content_remove;
Efl.Container.content_iterate;
diff --git a/src/lib/elementary/efl_ui_slider.c
b/src/lib/elementary/efl_ui_slider.c
index 789a43e686..be7232bcab 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -1299,11 +1299,11 @@ _efl_ui_slider_step_get(Eo *obj EINA_UNUSED,
Efl_Ui_Slider_Data *sd)
}
EOLIAN static Eina_Bool
-_efl_ui_slider_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Slider_Data *sd
EINA_UNUSED)
+_efl_ui_slider_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Slider_Data
*sd EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
- int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
+ int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if ((sd->indicator_visible_mode ==
ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS) &&
efl_ui_focus_object_focus_get(obj))
_popup_show(obj, NULL, NULL, NULL);
diff --git a/src/lib/elementary/efl_ui_slider.eo
b/src/lib/elementary/efl_ui_slider.eo
index 55007f3e24..50092849f0 100644
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -39,7 +39,7 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range,
Efl.Ui.Direction,
Efl.Canvas.Group.group_calculate;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_activate;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Ui.Range.range_value { get; set; }
Efl.Ui.Range.range_min_max {get; set; }
diff --git a/src/lib/elementary/efl_ui_spin_button.c
b/src/lib/elementary/efl_ui_spin_button.c
index 1c97c84382..34d969d4ae 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -568,11 +568,11 @@ _efl_ui_spin_button_efl_ui_widget_widget_event(Eo *obj,
Efl_Ui_Spin_Button_Data
}
EOLIAN static Eina_Bool
-_efl_ui_spin_button_efl_ui_widget_on_focus_update(Eo *obj,
Efl_Ui_Spin_Button_Data *sd)
+_efl_ui_spin_button_efl_ui_focus_object_on_focus_update(Eo *obj,
Efl_Ui_Spin_Button_Data *sd)
{
Eina_Bool int_ret = EINA_FALSE;
- int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
+ int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (!efl_ui_focus_object_focus_get(obj))
diff --git a/src/lib/elementary/efl_ui_spin_button.eo
b/src/lib/elementary/efl_ui_spin_button.eo
index 581e0b493f..1bf2f2ac0c 100644
--- a/src/lib/elementary/efl_ui_spin_button.eo
+++ b/src/lib/elementary/efl_ui_spin_button.eo
@@ -66,7 +66,7 @@ class Efl.Ui.Spin_Button (Efl.Ui.Spin,
Efl.Ui.Focus.Composition,
Efl.Object.constructor;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.widget_event;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Range.range_value { set; }
Efl.Access.name { get; }
Efl.Access.Value.value_and_text { get; set; }
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 8102b4576f..ca76023171 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -1128,7 +1128,7 @@ _return_key_enabled_check(Evas_Object *obj)
}
EOLIAN static Eina_Bool
-_efl_ui_text_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd)
+_efl_ui_text_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd)
{
Evas_Object *top;
Eina_Bool top_is_win = EINA_FALSE;
diff --git a/src/lib/elementary/efl_ui_text.eo
b/src/lib/elementary/efl_ui_text.eo
index 515fc0dfda..5146d2ce8e 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -331,7 +331,7 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable,
Efl.Ui.Clickable,
Efl.Layout.Signal.signal_emit;
Efl.Ui.Widget.on_access_activate;
Efl.Ui.Widget.theme_apply;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.interest_region { get; }
Efl.Ui.Widget.on_disabled_update;
Efl.Ui.Widget.widget_sub_object_del;
diff --git a/src/lib/elementary/efl_ui_widget.c
b/src/lib/elementary/efl_ui_widget.c
index 6b822e0586..2816397da4 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -2390,7 +2390,7 @@ _elm_widget_top_win_focused_set(Evas_Object *obj,
sd->top_win_focused = top_win_focused;
if (sd->focused && !sd->top_win_focused)
- efl_ui_widget_on_focus_update(obj);
+ efl_ui_focus_object_on_focus_update(obj);
}
Eina_Bool
@@ -5236,7 +5236,7 @@ _efl_ui_widget_efl_object_debug_name_override(Eo *obj,
Elm_Widget_Smart_Data *sd
}
EOLIAN static Eina_Bool
-_efl_ui_widget_on_focus_update(Eo *obj, Elm_Widget_Smart_Data *sd)
+_efl_ui_widget_efl_ui_focus_object_on_focus_update(Eo *obj,
Elm_Widget_Smart_Data *sd)
{
Eina_Bool focused;
@@ -5518,7 +5518,7 @@ _efl_ui_widget_efl_ui_focus_object_focus_set(Eo *obj,
Elm_Widget_Smart_Data *pd,
efl_ui_focus_object_focus_set(efl_super(obj, MY_CLASS), focus);
- efl_ui_widget_on_focus_update(obj);
+ efl_ui_focus_object_on_focus_update(obj);
}
EOLIAN static Efl_Ui_Focus_Manager*
diff --git a/src/lib/elementary/efl_ui_widget.eo
b/src/lib/elementary/efl_ui_widget.eo
index 0566407c9e..340ed501b7 100644
--- a/src/lib/elementary/efl_ui_widget.eo
+++ b/src/lib/elementary/efl_ui_widget.eo
@@ -313,10 +313,6 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access,
return: Efl.Ui.Theme.Apply; [[Indicates success, and if the current
theme or default theme was used.]]
}
- on_focus_update @protected {
- [[Virtual function handling focus in/out events on the widget]]
- return: bool; [[$true if this widget can handle focus, $false
otherwise]]
- }
/* Scroll API. */
@property on_show_region_hook @protected {
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index a838dba11a..fd2eea0427 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1666,9 +1666,9 @@ _elm_win_state_change(Ecore_Evas *ee)
}
EOLIAN static Eina_Bool
-_efl_ui_win_efl_ui_widget_on_focus_update(Eo *obj, Efl_Ui_Win_Data *sd)
+_efl_ui_win_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Win_Data *sd)
{
- if (!efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS)))
+ if (!efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS)))
return EINA_TRUE;
if (sd->img_obj)
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 462d38e070..26264d84d7 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -784,7 +784,7 @@ class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas,
Efl.Canvas.Pointer, Efl.Access.Wind
Efl.Ui.Widget.focus_highlight_style { get; set; }
Efl.Ui.Widget.focus_highlight_enabled { get; set; }
Efl.Ui.Widget.focus_highlight_animate { get; set; }
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Ui.Widget.focus_manager_create;
Efl.Access.parent { get; }
diff --git a/src/lib/elementary/elementary_config.h
b/src/lib/elementary/elementary_config.h
index 9e066041bf..8c44596cfb 100644
--- a/src/lib/elementary/elementary_config.h
+++ b/src/lib/elementary/elementary_config.h
@@ -23,4 +23,5 @@
#define EFL_ACCESS_TEXT_BETA
#define EFL_ACCESS_VALUE_BETA
#define EFL_ACCESS_WIDGET_ACTION_BETA
+#define EFL_UI_FOCUS_OBJECT_PROTECTED
#endif
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index 26991e47a5..a130ab8517 100644
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -145,7 +145,7 @@ _elm_access_efl_ui_widget_on_access_activate(Eo *obj, void
*_pd EINA_UNUSED, Efl
}
EOLIAN static Eina_Bool
-_elm_access_efl_ui_widget_on_focus_update(Eo *obj, void *_pd EINA_UNUSED)
+_elm_access_efl_ui_focus_object_on_focus_update(Eo *obj, void *_pd EINA_UNUSED)
{
evas_object_focus_set(obj, efl_ui_focus_object_focus_get(obj));
diff --git a/src/lib/elementary/elm_access.eo b/src/lib/elementary/elm_access.eo
index b730f4af8a..29e85037d0 100644
--- a/src/lib/elementary/elm_access.eo
+++ b/src/lib/elementary/elm_access.eo
@@ -8,7 +8,7 @@ class Elm.Access (Efl.Ui.Widget, Efl.Access.Widget.Action)
class.constructor;
Efl.Object.constructor;
Efl.Ui.Widget.on_access_activate;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Access.state_set { get; }
}
diff --git a/src/lib/elementary/elm_calendar.c
b/src/lib/elementary/elm_calendar.c
index 446f09c434..dc57a5688c 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -1386,11 +1386,11 @@ _key_action_activate(Evas_Object *obj, const char
*params EINA_UNUSED)
}
EOLIAN static Eina_Bool
-_elm_calendar_efl_ui_widget_on_focus_update(Eo *obj, Elm_Calendar_Data *sd)
+_elm_calendar_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Calendar_Data
*sd)
{
Eina_Bool int_ret = EINA_FALSE;
- int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
+ int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))
diff --git a/src/lib/elementary/elm_calendar.eo
b/src/lib/elementary/elm_calendar.eo
index 952db0db6a..80c77480f1 100644
--- a/src/lib/elementary/elm_calendar.eo
+++ b/src/lib/elementary/elm_calendar.eo
@@ -414,7 +414,7 @@ class Elm.Calendar (Efl.Ui.Layout,
Efl.Ui.Focus.Composition, Efl.Access.Widget.A
Efl.Canvas.Group.group_calculate;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_update;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Access.Widget.Action.elm_actions { get; }
}
diff --git a/src/lib/elementary/elm_diskselector.c
b/src/lib/elementary/elm_diskselector.c
index 4fea69467e..f60226adf9 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -897,12 +897,12 @@ _elm_diskselector_efl_ui_widget_widget_sub_object_del(Eo
*obj, Elm_Diskselector_
}
EOLIAN static Eina_Bool
-_elm_diskselector_efl_ui_widget_on_focus_update(Eo *obj, Elm_Diskselector_Data
*_pd EINA_UNUSED)
+_elm_diskselector_efl_ui_focus_object_on_focus_update(Eo *obj,
Elm_Diskselector_Data *_pd EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
- int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
+ int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))
diff --git a/src/lib/elementary/elm_diskselector.eo
b/src/lib/elementary/elm_diskselector.eo
index 6a179713f1..29c5787a30 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -203,7 +203,7 @@ class Elm.Diskselector (Efl.Ui.Widget,
Elm.Interface_Scrollable,
Efl.Canvas.Group.group_member_add;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.theme_apply;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Translatable.translation_update;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Ui.Widget.widget_event;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 4e78e4b1f5..6851ce5c79 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1301,7 +1301,7 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd)
}
EOLIAN static Eina_Bool
-_elm_entry_efl_ui_widget_on_focus_update(Eo *obj, Elm_Entry_Data *sd)
+_elm_entry_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Entry_Data *sd)
{
_elm_entry_focus_update(obj, sd);
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index f4c8fc504d..b90a961387 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -847,7 +847,7 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable,
Efl.Ui.Clickable,
Efl.Layout.Signal.signal_emit;
Efl.Ui.Widget.on_access_activate;
Efl.Ui.Widget.theme_apply;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.interest_region { get; }
Efl.Ui.Widget.on_disabled_update;
Efl.Ui.Widget.widget_sub_object_del;
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 4693095696..07ba4f1a84 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -3366,13 +3366,13 @@ _elm_genlist_nearest_visible_item_get(Evas_Object *obj,
Elm_Object_Item *eo_it)
}
EOLIAN static Eina_Bool
-_elm_genlist_efl_ui_widget_on_focus_update(Eo *obj, Elm_Genlist_Data *sd)
+_elm_genlist_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Genlist_Data *sd)
{
Eina_Bool int_ret = EINA_FALSE;
Elm_Object_Item *eo_it = NULL;
Eina_Bool is_sel = EINA_FALSE;
- int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
+ int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj) && (sd->items) && (sd->selected) &&
diff --git a/src/lib/elementary/elm_genlist.eo
b/src/lib/elementary/elm_genlist.eo
index 7a88adcf1c..318655f291 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -537,7 +537,7 @@ class Elm.Genlist (Efl.Ui.Layout, Efl.Ui.Focus.Composition,
Elm.Interface_Scroll
Efl.Ui.Widget.widget_sub_object_add;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.focus_highlight_geometry { get; }
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Ui.Widget.widget_event;
Efl.Ui.Widget.focused_item { get; }
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index ad91884be6..8f48ba4f38 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -27,12 +27,12 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
{
};
EOLIAN static Eina_Bool
-_elm_glview_efl_ui_widget_on_focus_update(Eo *obj, Elm_Glview_Data *_pd
EINA_UNUSED)
+_elm_glview_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Glview_Data *_pd
EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
- int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
+ int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))
diff --git a/src/lib/elementary/elm_glview.eo b/src/lib/elementary/elm_glview.eo
index c44946f229..aafb81bbc6 100644
--- a/src/lib/elementary/elm_glview.eo
+++ b/src/lib/elementary/elm_glview.eo
@@ -190,7 +190,7 @@ class Elm.Glview (Efl.Ui.Widget, Efl.Gfx.View)
class.constructor;
Efl.Object.finalize;
Efl.Gfx.size { set; }
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Gfx.View.view_size { get; set; }
}
events {
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 67421e5bfc..0401ae8188 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -1236,13 +1236,13 @@ _elm_list_nearest_visible_item_get(Evas_Object *obj,
Elm_List_Item_Data *it)
}
EOLIAN static Eina_Bool
-_elm_list_efl_ui_widget_on_focus_update(Eo *obj, Elm_List_Data *sd)
+_elm_list_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_List_Data *sd)
{
Eina_Bool int_ret = EINA_FALSE;
Elm_Object_Item *eo_it = NULL;
Eina_Bool is_sel = EINA_FALSE;
- int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
+ int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (elm_object_focus_get(obj) && sd->selected && !sd->last_selected_item)
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index fa2a335d44..5987cca579 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -437,7 +437,7 @@ class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.focus_highlight_geometry { get; }
Efl.Ui.Widget.on_disabled_update;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Translatable.translation_update;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Ui.Widget.widget_event;
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 019a8dd555..fcdee6acc8 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -3945,12 +3945,12 @@ _elm_map_pan_efl_gfx_position_set(Eo *obj,
Elm_Map_Pan_Data *_pd EINA_UNUSED, Ei
}
EOLIAN static Eina_Bool
-_elm_map_efl_ui_widget_on_focus_update(Eo *obj, Elm_Map_Data *_pd EINA_UNUSED)
+_elm_map_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Map_Data *_pd
EINA_UNUSED)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
- int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
+ int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))
diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index 0e1c982b64..a20ccff9dc 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -631,7 +631,7 @@ class Elm.Map (Efl.Ui.Widget, Elm.Interface_Scrollable,
Efl.Gfx.size { set; }
Efl.Canvas.Group.group_member_add;
Efl.Ui.Widget.theme_apply;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Access.Widget.Action.elm_actions { get; }
}
diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c
index d0a72ab02c..8178d551c0 100644
--- a/src/lib/elementary/elm_plug.c
+++ b/src/lib/elementary/elm_plug.c
@@ -59,13 +59,13 @@ _elm_plug_resized(Ecore_Evas *ee)
}
EOLIAN static Eina_Bool
-_elm_plug_efl_ui_widget_on_focus_update(Eo *obj, void *sd EINA_UNUSED)
+_elm_plug_efl_ui_focus_object_on_focus_update(Eo *obj, void *sd EINA_UNUSED)
{
Eina_Bool int_ret = EINA_FALSE;
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
- int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
+ int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (efl_ui_focus_object_focus_get(obj))
diff --git a/src/lib/elementary/elm_plug.eo b/src/lib/elementary/elm_plug.eo
index 05020e04a3..674835c240 100644
--- a/src/lib/elementary/elm_plug.eo
+++ b/src/lib/elementary/elm_plug.eo
@@ -34,7 +34,7 @@ class Elm.Plug (Efl.Ui.Widget, Efl.Ui.Clickable)
class.constructor;
Efl.Object.constructor;
Efl.Ui.Widget.theme_apply;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
}
events {
image,deleted; [[Called when image was deleted]]
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index 97258b4c6f..8c4789929c 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -930,11 +930,11 @@ _elm_spinner_elm_layout_sizing_eval(Eo *obj,
Elm_Spinner_Data *_pd EINA_UNUSED)
}
EOLIAN static Eina_Bool
-_elm_spinner_efl_ui_widget_on_focus_update(Eo *obj, Elm_Spinner_Data *sd)
+_elm_spinner_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Spinner_Data *sd)
{
Eina_Bool int_ret = EINA_FALSE;
- int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
+ int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (!efl_ui_focus_object_focus_get(obj))
diff --git a/src/lib/elementary/elm_spinner.eo
b/src/lib/elementary/elm_spinner.eo
index 5248eea6d8..8cc571dde2 100644
--- a/src/lib/elementary/elm_spinner.eo
+++ b/src/lib/elementary/elm_spinner.eo
@@ -172,7 +172,7 @@ class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Range,
Efl.Ui.Focus.Composition,
Efl.Object.constructor;
Efl.Ui.Widget.theme_apply;
Efl.Ui.Widget.on_access_update;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Ui.Range.range_min_max { get; set; }
Efl.Ui.Range.range_step { get; set; }
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 72c44a097e..a5a774b7ec 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -746,13 +746,13 @@ _elm_toolbar_nearest_visible_item_get(Evas_Object *obj,
Elm_Object_Item *eo_it)
}
EOLIAN static Eina_Bool
-_elm_toolbar_efl_ui_widget_on_focus_update(Eo *obj, Elm_Toolbar_Data *sd)
+_elm_toolbar_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Toolbar_Data *sd)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
Eina_Bool int_ret = EINA_FALSE;
Elm_Object_Item *eo_it = NULL;
- int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS));
+ int_ret = efl_ui_focus_object_on_focus_update(efl_super(obj, MY_CLASS));
if (!int_ret) return EINA_FALSE;
if (!sd->items) return EINA_FALSE;
diff --git a/src/lib/elementary/elm_toolbar.eo
b/src/lib/elementary/elm_toolbar.eo
index e77c55f6b6..4847729292 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -322,7 +322,7 @@ class Elm.Toolbar (Efl.Ui.Widget, Efl.Ui.Focus.Composition,
Elm.Interface_Scroll
Efl.Canvas.Group.group_member_add;
Efl.Ui.Widget.on_access_update;
Efl.Ui.Widget.theme_apply;
- Efl.Ui.Widget.on_focus_update;
+ Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Translatable.translation_update;
Efl.Ui.Widget.widget_event;
Efl.Ui.Widget.focus_highlight_geometry { get; }
--
