enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

fix evas object warnings - and fix dropwshadow bug 

SVN revision: 14618
This commit is contained in:
Carsten Haitzler 2005-05-06 06:22:22 +00:00
parent a021f2a66b
commit 46e410368f
6 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/e_box.c
View File

@ -351,7 +351,7 @@ _e_box_smart_adopt(E_Smart_Data *sd, Evas_Object *obj)
bi->max.h = 0;
evas_object_clip_set(obj, sd->clip);
evas_object_stack_above(obj, sd->obj);
evas_object_smart_member_add(bi->sd->obj, obj);
evas_object_smart_member_add(obj, bi->sd->obj);
evas_object_data_set(obj, "e_box_data", bi);
evas_object_event_callback_add(obj, EVAS_CALLBACK_FREE,
_e_box_smart_item_del_hook, NULL);
@ -641,7 +641,7 @@ _e_box_smart_add(Evas_Object *obj)
sd->w = 0;
sd->h = 0;
sd->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
evas_object_smart_member_add(obj, sd->clip);
evas_object_smart_member_add(sd->clip, obj);
evas_object_move(sd->clip, -100000, -100000);
evas_object_resize(sd->clip, 200000, 200000);
evas_object_color_set(sd->clip, 255, 255, 255, 255);

14
src/bin/e_gadman.c
View File

@ -976,10 +976,16 @@ _e_gadman_client_aspect_enforce(E_Gadman_Client *gmc, double cx, double cy, int
static void
_e_gadman_client_geometry_apply(E_Gadman_Client *gmc)
{
evas_object_move(gmc->event_object, gmc->x, gmc->y);
evas_object_resize(gmc->event_object, gmc->w, gmc->h);
evas_object_move(gmc->control_object, gmc->x, gmc->y);
evas_object_resize(gmc->control_object, gmc->w, gmc->h);
if (gmc->event_object)
{
evas_object_move(gmc->event_object, gmc->x, gmc->y);
evas_object_resize(gmc->event_object, gmc->w, gmc->h);
}
if (gmc->control_object)
{
evas_object_move(gmc->control_object, gmc->x, gmc->y);
evas_object_resize(gmc->control_object, gmc->w, gmc->h);
}
}
static void

4
src/bin/e_layout.c
View File

@ -231,7 +231,7 @@ _e_layout_smart_adopt(E_Smart_Data *sd, Evas_Object *obj)
li->w = 0;
li->h = 0;
evas_object_clip_set(obj, sd->clip);
evas_object_smart_member_add(li->sd->obj, obj);
evas_object_smart_member_add(obj, li->sd->obj);
evas_object_data_set(obj, "e_layout_data", li);
evas_object_event_callback_add(obj, EVAS_CALLBACK_FREE,
_e_layout_smart_item_del_hook, NULL);
@ -343,7 +343,7 @@ _e_layout_smart_add(Evas_Object *obj)
sd->vw = 1;
sd->vh = 1;
sd->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
evas_object_smart_member_add(obj, sd->clip);
evas_object_smart_member_add(sd->clip, obj);
evas_object_move(sd->clip, -100000, -100000);
evas_object_resize(sd->clip, 200000, 200000);
evas_object_color_set(sd->clip, 255, 255, 255, 255);

6
src/bin/e_menu.c
View File

@ -449,7 +449,8 @@ e_menu_item_toggle_set(E_Menu_Item *mi, int tog)
edje_object_signal_emit(mi->submenu_object, "toggle_on", "");
if (mi->toggle_object)
edje_object_signal_emit(mi->toggle_object, "toggle_on", "");
edje_object_signal_emit(mi->menu->bg_object, "toggle_on", "");
if (mi->menu->bg_object)
edje_object_signal_emit(mi->menu->bg_object, "toggle_on", "");
}
else
{
@ -464,7 +465,8 @@ e_menu_item_toggle_set(E_Menu_Item *mi, int tog)
edje_object_signal_emit(mi->submenu_object, "toggle_off", "");
if (mi->toggle_object)
edje_object_signal_emit(mi->toggle_object, "toggle_off", "");
edje_object_signal_emit(mi->menu->bg_object, "toggle_off", "");
if (mi->menu->bg_object)
edje_object_signal_emit(mi->menu->bg_object, "toggle_off", "");
}
if (tog)
{

4
src/bin/e_table.c
View File

@ -252,7 +252,7 @@ _e_table_smart_adopt(E_Smart_Data *sd, Evas_Object *obj)
ti->max.h = 0;
evas_object_clip_set(obj, sd->clip);
evas_object_stack_above(obj, sd->obj);
evas_object_smart_member_add(ti->sd->obj, obj);
evas_object_smart_member_add(obj, ti->sd->obj);
evas_object_data_set(obj, "e_table_data", ti);
evas_object_event_callback_add(obj, EVAS_CALLBACK_FREE,
_e_table_smart_item_del_hook, NULL);
@ -451,7 +451,7 @@ _e_table_smart_add(Evas_Object *obj)
sd->w = 0;
sd->h = 0;
sd->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
evas_object_smart_member_add(obj, sd->clip);
evas_object_smart_member_add(sd->clip, obj);
evas_object_move(sd->clip, -100000, -100000);
evas_object_resize(sd->clip, 200000, 200000);
evas_object_color_set(sd->clip, 255, 255, 255, 255);

35
src/modules/dropshadow/e_mod_main.c
View File

@ -915,6 +915,10 @@ _ds_shadow_resize(Shadow *sh, int w, int h)
evas_object_resize(sh->object[3], sh->w + (sh->ds->conf->blur_size * 2), sh->ds->conf->blur_size + sh->ds->conf->shadow_y);
evas_object_image_fill_set(sh->object[3], 0, 0, sh->w + (sh->ds->conf->blur_size * 2), sh->ds->conf->blur_size + sh->ds->conf->shadow_y);
}
else
{
sh->reshape = 1;
}
}
else
{
@ -1158,32 +1162,6 @@ _ds_shadow_recalc(Shadow *sh)
_ds_shpix_object_set(sp, so->obj,
r->x, r->y, r->w, r->h);
}
#if 0
_ds_shpix_object_set(sp, sh->object[0], 0, 0,
(shw + (bsz * 2)) / q, (shh + (bsz * 2)) / q);
evas_object_move(sh->object[0],
sh->x + shx - bsz,
sh->y + shy - bsz);
evas_object_image_smooth_scale_set(sh->object[0], 1);
evas_object_image_border_set(sh->object[0],
0, 0, 0, 0);
evas_object_resize(sh->object[0],
sh->w + (bsz * 2),
sh->h + (bsz * 2));
evas_object_image_fill_set(sh->object[0], 0, 0,
sh->w + (bsz * 2),
sh->h + (bsz * 2));
_ds_object_unset(sh->object[1]);
_ds_object_unset(sh->object[2]);
_ds_object_unset(sh->object[3]);
if (evas_object_visible_get(sh->object[0]))
{
evas_object_hide(sh->object[1]);
evas_object_hide(sh->object[2]);
evas_object_hide(sh->object[3]);
}
#endif
_ds_shpix_free(sp);
_tilebuf_free_render_rects(brects);
@ -1212,6 +1190,8 @@ _ds_shadow_recalc(Shadow *sh)
}
else
{
_ds_shadow_obj_shutdown(sh);
_ds_shadow_obj_init(sh);
_ds_shared_use(sh->ds, sh);
sh->use_shared = 1;
}
@ -1310,8 +1290,9 @@ _ds_shadow_recalc(Shadow *sh)
}
}
if (evas_object_visible_get(sh->object[0]))
if (sh->visible)
{
evas_object_show(sh->object[0]);
evas_object_show(sh->object[1]);
evas_object_show(sh->object[2]);
evas_object_show(sh->object[3]);