woohyun pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=62f8db5e7e5394051281b9996cae7ea7e2368d8d
commit 62f8db5e7e5394051281b9996cae7ea7e2368d8d
Author: WooHyun Jung <wh0705.j...@samsung.com>
Date: Thu Feb 6 16:18:57 2014 +0900
elm_layout now supports focused/unfocused smart callback
by itself for widgets that inherit layout class.
If it uses elm_widget's, smart callback will be called at the
beginning or smart_on_focus function.
---
src/lib/elc_ctxpopup.c | 4 ++--
src/lib/elc_fileselector.c | 4 ++--
src/lib/elc_fileselector_button.c | 4 ++--
src/lib/elc_naviframe.c | 4 ++--
src/lib/elc_player.c | 4 ++--
src/lib/elc_popup.c | 4 ++--
src/lib/elm_bubble.c | 4 ++--
src/lib/elm_button.c | 4 ++--
src/lib/elm_calendar.c | 4 ++--
src/lib/elm_check.c | 4 ++--
src/lib/elm_clock.c | 4 ++--
src/lib/elm_colorselector.c | 4 ++--
src/lib/elm_datetime.c | 4 ++--
src/lib/elm_flipselector.c | 4 ++--
src/lib/elm_gengrid.c | 4 ++--
src/lib/elm_genlist.c | 4 ++--
src/lib/elm_hover.c | 4 ++--
src/lib/elm_index.c | 4 ++--
src/lib/elm_layout.c | 10 +++++++---
src/lib/elm_list.c | 4 ++--
src/lib/elm_panel.c | 4 ++--
src/lib/elm_priv.h | 2 ++
src/lib/elm_progressbar.c | 4 ++--
src/lib/elm_radio.c | 4 ++--
src/lib/elm_scroller.c | 4 ++--
src/lib/elm_slider.c | 4 ++--
src/lib/elm_slideshow.c | 4 ++--
src/lib/elm_spinner.c | 4 ++--
src/lib/elm_video.c | 4 ++--
29 files changed, 63 insertions(+), 57 deletions(-)
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 1109bb1..10df5e6 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -24,8 +24,8 @@ ELM_PRIV_CTXPOPUP_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE);
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
ELM_PRIV_CTXPOPUP_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC)
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
#undef ELM_PRIV_CTXPOPUP_SIGNALS
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 9c05086..d6c3e6d 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -38,8 +38,8 @@
ELM_PRIV_FILESELECTOR_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE);
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
ELM_PRIV_FILESELECTOR_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC)
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
#undef ELM_PRIV_FILESELECTOR_SIGNALS
diff --git a/src/lib/elc_fileselector_button.c
b/src/lib/elc_fileselector_button.c
index f845866..1a6e951 100644
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -24,8 +24,8 @@
ELM_PRIV_FILESELECTOR_BUTTON_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE);
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
ELM_PRIV_FILESELECTOR_BUTTON_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC)
{SIG_WIDGET_LANG_CHANGED, ""}, /**<handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
#undef ELM_PRIV_FILESELECTOR_BUTTON_SIGNALS
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 569a31f..2173ff5 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -31,8 +31,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_TITLE_TRANSITION_FINISHED, ""},
{SIG_TITLE_CLICKED, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index 136af9e..7bf4824 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -51,8 +51,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{ SIG_VOLUME_CLICKED, "" },
{ SIG_MUTE_CLICKED, "" },
{ SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- { SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- { SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ { SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ { SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{ NULL, NULL }
};
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index ecd724f..edc1a6a 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -28,8 +28,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_BLOCK_CLICKED, ""},
{SIG_TIMEOUT, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index 0f0ea7d..ea74e1e 100644
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -19,8 +19,8 @@ static const char SIG_CLICKED[] = "clicked";
static const Evas_Smart_Cb_Description _smart_callbacks[] =
{
{SIG_CLICKED, ""},
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index d09b12f..28ce15c 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -26,8 +26,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_REPEATED, ""},
{SIG_PRESSED, ""},
{SIG_UNPRESSED, ""},
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index c32028c..b611009 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -20,8 +20,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_CHANGED, ""},
{SIG_DISPLAY_CHANGED, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index 5147b9e..58c2afe 100644
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -34,8 +34,8 @@ static const char SIG_CHANGED[] = "changed";
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_CHANGED, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index 8063749..26912f4 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -21,8 +21,8 @@ static const char SIG_CHANGED[] = "changed";
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_CHANGED, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index fddd110..0809689 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -30,8 +30,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
{SIG_COLOR_ITEM_LONGPRESSED, ""},
{SIG_CHANGED, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index 6100b1c..5db4251 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -66,8 +66,8 @@ static const char SIG_CHANGED[] = "changed";
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_CHANGED, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index b8667f3..fb38002 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -43,8 +43,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_UNDERFLOWED, ""},
{SIG_OVERFLOWED, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 588dd18..e71bfcb 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -75,8 +75,8 @@ ELM_PRIV_GENGRID_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE);
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
ELM_PRIV_GENGRID_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC)
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 2cf191a..86e7efb 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -94,8 +94,8 @@ ELM_PRIV_GENLIST_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE);
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
ELM_PRIV_GENLIST_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC)
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 13196fc..2857c86 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -50,8 +50,8 @@ ELM_PRIV_HOVER_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE);
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
ELM_PRIV_HOVER_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC)
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
#undef ELM_PRIV_HOVER_SIGNALS
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index e7a1fe9..e012539 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -31,8 +31,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_LEVEL_UP, ""},
{SIG_LEVEL_DOWN, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index 4f10c3b..4fa8724 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -15,10 +15,14 @@ EAPI Eo_Op ELM_OBJ_LAYOUT_BASE_ID = EO_NOOP;
#define MY_CLASS_NAME_LEGACY "elm_layout"
static const char SIG_THEME_CHANGED[] = "theme,changed";
+const char SIG_LAYOUT_FOCUSED[] = "focused";
+const char SIG_LAYOUT_UNFOCUSED[] = "unfocused";
/* smart callbacks coming from elm layout objects: */
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_THEME_CHANGED, ""},
+ {SIG_LAYOUT_FOCUSED, ""},
+ {SIG_LAYOUT_UNFOCUSED, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
{NULL, NULL}
};
@@ -392,20 +396,20 @@ _elm_layout_smart_on_focus(Eo *obj, void *_pd
EINA_UNUSED, va_list *list)
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
if (ret) *ret = EINA_FALSE;
- Eina_Bool int_ret = EINA_FALSE;
- eo_do_super(obj, MY_CLASS, elm_wdg_on_focus(&int_ret));
- if (!int_ret) return;
+ if (!elm_widget_can_focus_get(obj)) return;
if (elm_widget_focus_get(obj))
{
elm_layout_signal_emit(obj, "elm,action,focus", "elm");
evas_object_focus_set(wd->resize_obj, EINA_TRUE);
+ evas_object_smart_callback_call(obj, SIG_LAYOUT_FOCUSED, NULL);
}
else
{
elm_layout_signal_emit(obj, "elm,action,unfocus", "elm");
evas_object_focus_set(wd->resize_obj, EINA_FALSE);
+ evas_object_smart_callback_call(obj, SIG_LAYOUT_UNFOCUSED, NULL);
}
if (ret) *ret = EINA_TRUE;
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 4871256..a928133 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -43,8 +43,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_HIGHLIGHTED, ""},
{SIG_UNHIGHLIGHTED, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 62cd4aa..060c82f 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -15,8 +15,8 @@ EAPI Eo_Op ELM_OBJ_PANEL_BASE_ID = EO_NOOP;
#define MY_CLASS_NAME_LEGACY "elm_panel"
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index c20e5b1..889cd65 100644
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -493,6 +493,8 @@ extern const char *_elm_preferred_engine;
extern const char SIG_WIDGET_FOCUSED[];
extern const char SIG_WIDGET_UNFOCUSED[];
extern const char SIG_WIDGET_LANG_CHANGED[];
+extern const char SIG_LAYOUT_FOCUSED[];
+extern const char SIG_LAYOUT_UNFOCUSED[];
#ifdef ENABLE_NLS
/* Our gettext wrapper, used to disable translation of elm if the app
diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c
index 4915f47..7241323 100644
--- a/src/lib/elm_progressbar.c
+++ b/src/lib/elm_progressbar.c
@@ -25,8 +25,8 @@ static const char SIG_CHANGED[] = "changed";
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_CHANGED, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index a4f7594..c3739bf 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -31,8 +31,8 @@ static const char SIG_CHANGED[] = "changed";
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_CHANGED, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 410056a..9730f75 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -42,8 +42,8 @@ ELM_PRIV_SCROLLER_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE);
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
ELM_PRIV_SCROLLER_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC)
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
#undef ELM_PRIV_SCROLLER_SIGNALS
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index ff9627a..8151264 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -40,8 +40,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_DRAG_START, ""},
{SIG_DRAG_STOP, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 35fdd52..1930a36 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -21,8 +21,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_CHANGED, ""},
{SIG_TRANSITION_END, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 0271e02..ee617f2 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -30,8 +30,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_DRAG_START, ""},
{SIG_DRAG_STOP, ""},
{SIG_WIDGET_LANG_CHANGED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index 5416a66..1e82a32 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -21,8 +21,8 @@ EAPI Eo_Op ELM_OBJ_VIDEO_BASE_ID = EO_NOOP;
#define MY_CLASS_NAME_LEGACY "elm_video"
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
- {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
- {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+ {SIG_LAYOUT_FOCUSED, ""}, /**< handled by elm_layout */
+ {SIG_LAYOUT_UNFOCUSED, ""}, /**< handled by elm_layout */
{NULL, NULL}
};
--
