summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_panel.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary/efl_ui_panel.c')
-rw-r--r--src/lib/elementary/efl_ui_panel.c25
1 files changed, 11 insertions, 14 deletions
diff --git a/src/lib/elementary/efl_ui_panel.c b/src/lib/elementary/efl_ui_panel.c
index 8351c89..efab363 100644
--- a/src/lib/elementary/efl_ui_panel.c
+++ b/src/lib/elementary/efl_ui_panel.c
@@ -198,18 +198,18 @@ _scrollable_layout_theme_set(Eo *obj, Efl_Ui_Panel_Data *sd)
198 _access_obj_process(obj, EINA_TRUE); 198 _access_obj_process(obj, EINA_TRUE);
199} 199}
200 200
201EOLIAN static Efl_Ui_Theme_Apply_Result 201EOLIAN static Eina_Error
202_efl_ui_panel_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panel_Data *sd) 202_efl_ui_panel_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panel_Data *sd)
203{ 203{
204 const char *str; 204 const char *str;
205 Evas_Coord minw = 0, minh = 0; 205 Evas_Coord minw = 0, minh = 0;
206 206
207 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 207 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
208 208
209 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 209 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
210 210
211 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 211 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
212 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 212 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
213 213
214 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 214 _mirrored_set(obj, efl_ui_mirrored_get(obj));
215 215
@@ -705,10 +705,10 @@ _key_action_toggle(Evas_Object *obj, const char *params EINA_UNUSED)
705ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(panel, Efl_Ui_Panel_Data) 705ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(panel, Efl_Ui_Panel_Data)
706 706
707EOLIAN static Eina_Bool 707EOLIAN static Eina_Bool
708_efl_ui_panel_efl_ui_widget_widget_event(Eo *obj, Efl_Ui_Panel_Data *pd, const Efl_Event *eo_event, Evas_Object *src) 708_efl_ui_panel_efl_ui_widget_widget_input_event_handler(Eo *obj, Efl_Ui_Panel_Data *pd, const Efl_Event *eo_event, Evas_Object *src)
709{ 709{
710 if (src != obj) return EINA_FALSE; 710 if (src != obj) return EINA_FALSE;
711 return _panel_efl_ui_widget_widget_event(obj, pd, eo_event, src); 711 return _panel_efl_ui_widget_widget_input_event_handler(obj, pd, eo_event, src);
712} 712}
713 713
714static Eina_Bool 714static Eina_Bool
@@ -727,7 +727,7 @@ _efl_ui_panel_efl_content_content_set(Eo *obj, Efl_Ui_Panel_Data *sd, Efl_Gfx_En
727 else 727 else
728 elm_widget_sub_object_add(obj, sd->content); 728 elm_widget_sub_object_add(obj, sd->content);
729 } 729 }
730 730 efl_event_callback_call(obj, EFL_CONTENT_EVENT_CONTENT_CHANGED, content);
731 if (efl_finalized_get(obj)) 731 if (efl_finalized_get(obj))
732 elm_layout_sizing_eval(obj); 732 elm_layout_sizing_eval(obj);
733 733
@@ -752,7 +752,7 @@ _efl_ui_panel_efl_content_content_unset(Eo *obj EINA_UNUSED, Efl_Ui_Panel_Data *
752 if (sd->scrollable) 752 if (sd->scrollable)
753 _elm_widget_sub_object_redirect_to_top(sd->scr_ly, sd->content); 753 _elm_widget_sub_object_redirect_to_top(sd->scr_ly, sd->content);
754 sd->content = NULL; 754 sd->content = NULL;
755 755 efl_event_callback_call(obj, EFL_CONTENT_EVENT_CONTENT_CHANGED, NULL);
756 return ret; 756 return ret;
757} 757}
758 758
@@ -1156,11 +1156,10 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
1156 (obj, EFL_UI_EVENT_SCROLL, (void *) &event); 1156 (obj, EFL_UI_EVENT_SCROLL, (void *) &event);
1157} 1157}
1158 1158
1159EOLIAN static Eina_Bool 1159EOLIAN static void
1160_efl_ui_panel_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Panel_Data *sd, Eina_Bool disabled) 1160_efl_ui_panel_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Panel_Data *sd, Eina_Bool disabled)
1161{ 1161{
1162 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) 1162 efl_ui_widget_disabled_set(efl_super(obj, MY_CLASS), disabled);
1163 return EINA_FALSE;
1164 1163
1165 if (sd->scrollable) 1164 if (sd->scrollable)
1166 { 1165 {
@@ -1191,8 +1190,6 @@ _efl_ui_panel_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Panel_Data *sd, E
1191 sd->callback_added = EINA_TRUE; 1190 sd->callback_added = EINA_TRUE;
1192 } 1191 }
1193 } 1192 }
1194
1195 return EINA_TRUE;
1196} 1193}
1197 1194
1198EOLIAN static double 1195EOLIAN static double