summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_flip.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary/efl_ui_flip.c')
-rw-r--r--src/lib/elementary/efl_ui_flip.c24
1 files changed, 8 insertions, 16 deletions
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index 7f3238e..7f3da3c 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -97,12 +97,12 @@ _sizing_eval(Evas_Object *obj)
97 evas_object_size_hint_max_set(obj, maxw, maxh); 97 evas_object_size_hint_max_set(obj, maxw, maxh);
98} 98}
99 99
100EOLIAN static Efl_Ui_Theme_Apply_Result 100EOLIAN static Eina_Error
101_efl_ui_flip_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED) 101_efl_ui_flip_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED)
102{ 102{
103 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 103 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
104 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 104 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
105 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 105 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
106 106
107 _sizing_eval(obj); 107 _sizing_eval(obj);
108 108
@@ -1959,7 +1959,7 @@ _internal_elm_flip_go_to(Evas_Object *obj,
1959} 1959}
1960 1960
1961EOLIAN static void 1961EOLIAN static void
1962_efl_ui_flip_go_to(Eo *obj, Efl_Ui_Flip_Data *sd, Eina_Bool front, Elm_Flip_Mode mode) 1962_efl_ui_flip_go_to(Eo *obj, Efl_Ui_Flip_Data *sd, Eina_Bool front, Efl_Ui_Flip_Mode mode)
1963{ 1963{
1964 if (sd->next_state == front) return; 1964 if (sd->next_state == front) return;
1965 1965
@@ -1967,7 +1967,7 @@ _efl_ui_flip_go_to(Eo *obj, Efl_Ui_Flip_Data *sd, Eina_Bool front, Elm_Flip_Mode
1967} 1967}
1968 1968
1969EOLIAN static void 1969EOLIAN static void
1970_efl_ui_flip_go(Eo *obj, Efl_Ui_Flip_Data *sd, Elm_Flip_Mode mode) 1970_efl_ui_flip_go(Eo *obj, Efl_Ui_Flip_Data *sd, Efl_Ui_Flip_Mode mode)
1971{ 1971{
1972 _internal_elm_flip_go_to(obj, sd, !sd->state, mode); 1972 _internal_elm_flip_go_to(obj, sd, !sd->state, mode);
1973} 1973}
@@ -2210,15 +2210,6 @@ _efl_ui_flip_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *
2210} 2210}
2211 2211
2212EOLIAN static Eina_Bool 2212EOLIAN static Eina_Bool
2213_efl_ui_flip_efl_container_content_remove(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *content)
2214{
2215 pd->content_list = eina_list_remove(pd->content_list, content);
2216 pd->content_list = eina_list_remove(pd->content_list, content);
2217 _content_removed(obj, pd, content);
2218 return EINA_TRUE;
2219}
2220
2221EOLIAN static Eina_Bool
2222_efl_ui_flip_efl_pack_unpack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj) 2213_efl_ui_flip_efl_pack_unpack(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *subobj)
2223{ 2214{
2224 pd->content_list = eina_list_remove(pd->content_list, subobj); 2215 pd->content_list = eina_list_remove(pd->content_list, subobj);
@@ -2358,8 +2349,9 @@ ELM_PART_CONTENT_DEFAULT_GET(efl_ui_flip, "front")
2358 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_flip) 2349 EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_flip)
2359 2350
2360#include "efl_ui_flip.eo.c" 2351#include "efl_ui_flip.eo.c"
2352#include "efl_ui_flip_eo.legacy.c"
2361 2353
2362#include "efl_ui_flip_legacy.eo.h" 2354#include "efl_ui_flip_legacy_eo.h"
2363 2355
2364#define MY_CLASS_NAME_LEGACY "elm_flip" 2356#define MY_CLASS_NAME_LEGACY "elm_flip"
2365 2357
@@ -2384,4 +2376,4 @@ elm_flip_add(Evas_Object *parent)
2384 return elm_legacy_add(EFL_UI_FLIP_LEGACY_CLASS, parent); 2376 return elm_legacy_add(EFL_UI_FLIP_LEGACY_CLASS, parent);
2385} 2377}
2386 2378
2387#include "efl_ui_flip_legacy.eo.c" 2379#include "efl_ui_flip_legacy_eo.c"