enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

finally! flip works! happy! 

SVN revision: 51833
This commit is contained in:
Carsten Haitzler 2010-09-02 10:25:05 +00:00
parent b67066f6d3
commit 27298797f0
2 changed files with 18 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
legacy/elementary/src/lib/elm_flip.c
View File

@ -25,6 +25,7 @@ struct _Widget_Data
Ecore_Animator *animator;
double start, len;
Elm_Flip_Mode mode;
Evas_Object *clip;
struct {
Evas_Object *content, *clip;
} front, back;
@ -386,21 +387,31 @@ elm_flip_add(Evas_Object *parent)
elm_widget_del_hook_set(obj, _del_hook);
elm_widget_theme_hook_set(obj, _theme_hook);
wd->clip = evas_object_rectangle_add(e);
evas_object_color_set(wd->clip, 255, 255, 255, 255);
evas_object_move(wd->clip, -49999, -49999);
evas_object_resize(wd->clip, 99999, 99999);
elm_widget_sub_object_add(obj, wd->clip);
evas_object_clip_set(wd->clip, evas_object_clip_get(obj));
evas_object_smart_member_add(wd->clip, obj);
wd->front.clip = evas_object_rectangle_add(e);
evas_object_data_set(wd->front.clip, "_elm_leaveme", obj);
evas_object_color_set(wd->front.clip, 255, 255, 255, 255);
evas_object_move(wd->front.clip, -49999, -49999);
evas_object_resize(wd->front.clip, 99999, 99999);
elm_widget_sub_object_add(obj, wd->front.clip);
evas_object_smart_member_add(wd->front.clip, obj);
evas_object_clip_set(wd->front.clip, evas_object_clip_get(obj));
evas_object_clip_set(wd->front.clip, wd->clip);
wd->back.clip = evas_object_rectangle_add(e);
evas_object_data_set(wd->back.clip, "_elm_leaveme", obj);
evas_object_color_set(wd->back.clip, 255, 255, 255, 255);
evas_object_move(wd->back.clip, -49999, -49999);
evas_object_resize(wd->back.clip, 99999, 99999);
elm_widget_sub_object_add(wd->back.clip, obj);
evas_object_smart_member_add(obj, wd->back.clip);
evas_object_clip_set(wd->back.clip, evas_object_clip_get(obj));
evas_object_clip_set(wd->back.clip, wd->clip);
evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, NULL);

45
legacy/elementary/src/lib/elm_widget.c
View File

@ -1256,14 +1256,7 @@ _smart_show(Evas_Object *obj)
list = evas_object_smart_members_get(obj);
EINA_LIST_FOREACH(list, l, o)
{
Evas_Object *obj2;
obj2 = evas_object_clip_get(o);
if (obj2)
{
obj2 = evas_object_smart_parent_get(obj2);
if (obj2 == obj) continue;
}
if (evas_object_data_get(o, "_elm_leaveme")) continue;
evas_object_show(o);
}
}
@ -1277,14 +1270,7 @@ _smart_hide(Evas_Object *obj)
list = evas_object_smart_members_get(obj);
EINA_LIST_FOREACH(list, l, o)
{
Evas_Object *obj2;
obj2 = evas_object_clip_get(o);
if (obj2)
{
obj2 = evas_object_smart_parent_get(obj2);
if (obj2 == obj) continue;
}
if (evas_object_data_get(o, "_elm_leaveme")) continue;
evas_object_hide(o);
}
_if_focused_revert(obj);
@ -1299,14 +1285,7 @@ _smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
list = evas_object_smart_members_get(obj);
EINA_LIST_FOREACH(list, l, o)
{
Evas_Object *obj2;
obj2 = evas_object_clip_get(o);
if (obj2)
{
obj2 = evas_object_smart_parent_get(obj2);
if (obj2 == obj) continue;
}
if (evas_object_data_get(o, "_elm_leaveme")) continue;
evas_object_color_set(o, r, g, b, a);
}
}
@ -1320,14 +1299,7 @@ _smart_clip_set(Evas_Object *obj, Evas_Object *clip)
list = evas_object_smart_members_get(obj);
EINA_LIST_FOREACH(list, l, o)
{
Evas_Object *obj2;
obj2 = evas_object_clip_get(o);
if (obj2)
{
obj2 = evas_object_smart_parent_get(obj2);
if (obj2 == obj) continue;
}
if (evas_object_data_get(o, "_elm_leaveme")) continue;
evas_object_clip_set(o, clip);
}
}
@ -1341,14 +1313,7 @@ _smart_clip_unset(Evas_Object *obj)
list = evas_object_smart_members_get(obj);
EINA_LIST_FOREACH(list, l, o)
{
Evas_Object *obj2;
obj2 = evas_object_clip_get(o);
if (obj2)
{
obj2 = evas_object_smart_parent_get(obj2);
if (obj2 == obj) continue;
}
if (evas_object_data_get(o, "_elm_leaveme")) continue;
evas_object_clip_unset(o);
}
}