summaryrefslogtreecommitdiff
path: root/src/lib/elementary/elm_panel.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary/elm_panel.c')
-rw-r--r--src/lib/elementary/elm_panel.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index ac2fc24..b6e4728 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -216,18 +216,18 @@ _scrollable_layout_theme_set(Eo *obj, Elm_Panel_Data *sd)
216 _access_obj_process(obj, EINA_TRUE); 216 _access_obj_process(obj, EINA_TRUE);
217} 217}
218 218
219EOLIAN static Efl_Ui_Theme_Apply_Result 219EOLIAN static Eina_Error
220_elm_panel_efl_ui_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd) 220_elm_panel_efl_ui_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd)
221{ 221{
222 const char *str; 222 const char *str;
223 Evas_Coord minw = 0, minh = 0; 223 Evas_Coord minw = 0, minh = 0;
224 224
225 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 225 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
226 226
227 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 227 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
228 228
229 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 229 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
230 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 230 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
231 231
232 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 232 _mirrored_set(obj, efl_ui_mirrored_get(obj));
233 233
@@ -726,10 +726,10 @@ _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED)
726ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(panel, Elm_Panel_Data) 726ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(panel, Elm_Panel_Data)
727 727
728EOLIAN static Eina_Bool 728EOLIAN static Eina_Bool
729_elm_panel_efl_ui_widget_widget_event(Eo *obj, Elm_Panel_Data *pd, const Efl_Event *eo_event, Evas_Object *src) 729_elm_panel_efl_ui_widget_widget_input_event_handler(Eo *obj, Elm_Panel_Data *pd, const Efl_Event *eo_event, Evas_Object *src)
730{ 730{
731 if (src != obj) return EINA_FALSE; 731 if (src != obj) return EINA_FALSE;
732 return _panel_efl_ui_widget_widget_event(obj, pd, eo_event, src); 732 return _panel_efl_ui_widget_widget_input_event_handler(obj, pd, eo_event, src);
733} 733}
734 734
735static Eina_Bool 735static Eina_Bool
@@ -1242,15 +1242,14 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
1242 (obj, EFL_UI_EVENT_SCROLL, (void *) &event); 1242 (obj, EFL_UI_EVENT_SCROLL, (void *) &event);
1243} 1243}
1244 1244
1245EOLIAN static Eina_Bool 1245EOLIAN static void
1246_elm_panel_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Panel_Data *sd, Eina_Bool disabled) 1246_elm_panel_efl_ui_widget_disabled_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool disabled)
1247{ 1247{
1248 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) 1248 efl_ui_widget_disabled_set(efl_super(obj, MY_CLASS), disabled);
1249 return EINA_FALSE;
1250 1249
1251 if (sd->scrollable) 1250 if (sd->scrollable)
1252 { 1251 {
1253 if (disabled && sd->callback_added) 1252 if (efl_ui_widget_disabled_get(obj) && sd->callback_added)
1254 { 1253 {
1255 evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_DOWN, 1254 evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_DOWN,
1256 _on_mouse_down); 1255 _on_mouse_down);
@@ -1263,7 +1262,7 @@ _elm_panel_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Panel_Data *sd, Eina_Bo
1263 1262
1264 sd->callback_added = EINA_FALSE; 1263 sd->callback_added = EINA_FALSE;
1265 } 1264 }
1266 else if (!disabled && !sd->callback_added) 1265 else if (!efl_ui_widget_disabled_get(obj) && !sd->callback_added)
1267 { 1266 {
1268 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, 1267 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN,
1269 _on_mouse_down, sd); 1268 _on_mouse_down, sd);
@@ -1277,8 +1276,6 @@ _elm_panel_efl_ui_widget_on_disabled_update(Eo *obj, Elm_Panel_Data *sd, Eina_Bo
1277 sd->callback_added = EINA_TRUE; 1276 sd->callback_added = EINA_TRUE;
1278 } 1277 }
1279 } 1278 }
1280
1281 return EINA_TRUE;
1282} 1279}
1283 1280
1284EOLIAN static double 1281EOLIAN static double
@@ -1504,4 +1501,4 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_panel, ELM_PANEL, Elm_Panel_Data)
1504 ELM_LAYOUT_SIZING_EVAL_OPS(elm_panel), \ 1501 ELM_LAYOUT_SIZING_EVAL_OPS(elm_panel), \
1505 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_panel) 1502 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_panel)
1506 1503
1507#include "elm_panel.eo.c" 1504#include "elm_panel_eo.c"