summaryrefslogtreecommitdiff
path: root/src/lib/elementary/elc_hoversel.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary/elc_hoversel.c')
-rw-r--r--src/lib/elementary/elc_hoversel.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 07b251d..1314ffb 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -10,10 +10,10 @@
10 10
11#include <Elementary.h> 11#include <Elementary.h>
12#include "elm_priv.h" 12#include "elm_priv.h"
13#include "elm_hoversel.eo.h" 13#include "elm_hoversel_eo.h"
14#include "elm_hoversel_item.eo.h" 14#include "elm_hoversel_item_eo.h"
15#include "elm_widget_hoversel.h" 15#include "elm_widget_hoversel.h"
16#include "efl_ui_button_legacy.eo.h" 16#include "efl_ui_button_legacy_eo.h"
17 17
18#define MY_CLASS ELM_HOVERSEL_CLASS 18#define MY_CLASS ELM_HOVERSEL_CLASS
19 19
@@ -42,7 +42,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
42static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); 42static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
43static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params); 43static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
44static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params); 44static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params);
45static Eina_Bool _hoversel_efl_ui_widget_widget_event(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED); 45static Eina_Bool _hoversel_efl_ui_widget_widget_input_event_handler(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED, const Efl_Event *eo_event, Evas_Object *src EINA_UNUSED);
46 46
47static const Elm_Action key_actions[] = { 47static const Elm_Action key_actions[] = {
48 {"move", _key_action_move}, 48 {"move", _key_action_move},
@@ -63,14 +63,14 @@ _elm_hoversel_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Hoversel_D
63 efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS)); 63 efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS));
64} 64}
65 65
66EOLIAN static Efl_Ui_Theme_Apply_Result 66EOLIAN static Eina_Error
67_elm_hoversel_efl_ui_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd) 67_elm_hoversel_efl_ui_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
68{ 68{
69 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 69 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
70 Eina_List *l; 70 Eina_List *l;
71 Elm_Object_Item *eo_item; 71 Elm_Object_Item *eo_item;
72 72
73 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 73 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
74 74
75 char buf[4096]; 75 char buf[4096];
76 const char *style; 76 const char *style;
@@ -86,7 +86,7 @@ _elm_hoversel_efl_ui_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
86 elm_widget_theme_style_set(obj, buf); 86 elm_widget_theme_style_set(obj, buf);
87 87
88 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 88 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
89 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 89 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
90 90
91 elm_widget_theme_style_set(obj, style); 91 elm_widget_theme_style_set(obj, style);
92 92
@@ -447,7 +447,7 @@ _hover_key_down(void *data, const Efl_Event *ev)
447{ 447{
448 ELM_HOVERSEL_DATA_GET(ev->object, sd); 448 ELM_HOVERSEL_DATA_GET(ev->object, sd);
449 449
450 _hoversel_efl_ui_widget_widget_event(data, sd, ev, ev->object); 450 _hoversel_efl_ui_widget_widget_input_event_handler(data, sd, ev, ev->object);
451} 451}
452 452
453static void 453static void
@@ -1016,12 +1016,12 @@ _key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED)
1016ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(hoversel, Elm_Hoversel_Data) 1016ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(hoversel, Elm_Hoversel_Data)
1017 1017
1018EOLIAN static Eina_Bool 1018EOLIAN static Eina_Bool
1019_elm_hoversel_efl_ui_widget_widget_event(Eo *obj, Elm_Hoversel_Data *sd, const Efl_Event *eo_event, Evas_Object *src) 1019_elm_hoversel_efl_ui_widget_widget_input_event_handler(Eo *obj, Elm_Hoversel_Data *sd, const Efl_Event *eo_event, Evas_Object *src)
1020{ 1020{
1021 if (efl_ui_widget_event(efl_super(obj, MY_CLASS), eo_event, src)) 1021 if (efl_ui_widget_input_event_handler(efl_super(obj, MY_CLASS), eo_event, src))
1022 return EINA_TRUE; // note: this was FALSE but likely wrong 1022 return EINA_TRUE; // note: this was FALSE but likely wrong
1023 1023
1024 return _hoversel_efl_ui_widget_widget_event(obj, sd, eo_event, src); 1024 return _hoversel_efl_ui_widget_widget_input_event_handler(obj, sd, eo_event, src);
1025} 1025}
1026 1026
1027static void 1027static void
@@ -1068,5 +1068,5 @@ _elm_hoversel_auto_update_get(const Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd)
1068#define ELM_HOVERSEL_EXTRA_OPS \ 1068#define ELM_HOVERSEL_EXTRA_OPS \
1069 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_hoversel) 1069 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_hoversel)
1070 1070
1071#include "elm_hoversel_item.eo.c" 1071#include "elm_hoversel_item_eo.c"
1072#include "elm_hoversel.eo.c" 1072#include "elm_hoversel_eo.c"