styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use new zoomap function to set solidness on comp win reshadow

This commit is contained in:
Mike Blumenkrantz 2013-04-17 08:07:11 +01:00
parent bff0e74507
commit b702eddfd1
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/e_comp.c
View File

@ -1866,6 +1866,8 @@ _e_comp_win_shadow_setup(E_Comp_Win *cw)
if (cw->bd) no_shadow = 1; if (cw->bd) no_shadow = 1;
e_zoomap_child_set(cw->zoomobj, cw->obj); e_zoomap_child_set(cw->zoomobj, cw->obj);
} }
if (cw->bd || cw->eobj)
e_zoomap_child_edje_solid_setup(cw->zoomobj);
edje_object_part_swallow(cw->shobj, "e.swallow.content", cw->zoomobj); edje_object_part_swallow(cw->shobj, "e.swallow.content", cw->zoomobj);
if (!cw->visible) return; if (!cw->visible) return;
@ -1971,7 +1973,6 @@ _e_comp_win_dummy_add(E_Comp *c, Evas_Object *obj, E_Object *eobj, Eina_Bool nol
{ {
E_Comp_Win *cw; E_Comp_Win *cw;
int x, y, w, h; int x, y, w, h;
Eina_Bool solid = EINA_FALSE;
cw = calloc(1, sizeof(E_Comp_Win)); cw = calloc(1, sizeof(E_Comp_Win));
if (!cw) return NULL; if (!cw) return NULL;
@ -1993,7 +1994,6 @@ _e_comp_win_dummy_add(E_Comp *c, Evas_Object *obj, E_Object *eobj, Eina_Bool nol
cw->shape = cw->menu->shape; cw->shape = cw->menu->shape;
cw->dfn = e_object_delfn_add(E_OBJECT(cw->menu), _e_comp_object_del, cw); cw->dfn = e_object_delfn_add(E_OBJECT(cw->menu), _e_comp_object_del, cw);
cw->show_ready = cw->menu->cur.visible; cw->show_ready = cw->menu->cur.visible;
solid = cw->menu->solid;
break; break;
default: default:
CRI("UNHANDLED"); CRI("UNHANDLED");
@ -2019,7 +2019,6 @@ _e_comp_win_dummy_add(E_Comp *c, Evas_Object *obj, E_Object *eobj, Eina_Bool nol
e_theme_edje_object_set(cw->effect_obj, "base/theme/comp", "e/comp/effects/none"); e_theme_edje_object_set(cw->effect_obj, "base/theme/comp", "e/comp/effects/none");
cw->shobj = edje_object_add(c->evas); cw->shobj = edje_object_add(c->evas);
cw->zoomobj = e_zoomap_add(c->evas); cw->zoomobj = e_zoomap_add(c->evas);
e_zoomap_solid_set(cw->zoomobj, solid);
_e_comp_win_shadow_setup(cw); _e_comp_win_shadow_setup(cw);
edje_object_part_swallow(cw->effect_obj, "e.swallow.content", cw->shobj); edje_object_part_swallow(cw->effect_obj, "e.swallow.content", cw->shobj);

9
src/bin/e_menu.c
View File

@ -1704,14 +1704,7 @@ _e_menu_realize(E_Menu *m)
evas_object_name_set(o, "menu->bg_object"); evas_object_name_set(o, "menu->bg_object");
evas_object_data_set(o, "e_menu", m); evas_object_data_set(o, "e_menu", m);
evas_object_data_set(o, "eobj", m); evas_object_data_set(o, "eobj", m);
if (e_theme_edje_object_set(o, "base/theme/menus", "e/widgets/menu/default/background")) e_theme_edje_object_set(o, "base/theme/menus", "e/widgets/menu/default/background");
{
const char *s;
s = edje_object_data_get(m->bg_object, "argb");
if (!s) s = edje_object_data_get(m->bg_object, "shaped");
if ((!s) || (s[0] != '1')) m->solid = 1;
}
if (m->header.title) if (m->header.title)
{ {
edje_object_part_text_set(o, "e.text.title", m->header.title); edje_object_part_text_set(o, "e.text.title", m->header.title);

1
src/bin/e_menu.h
View File

@ -72,7 +72,6 @@ struct _E_Menu
Eina_Bool pending_new_submenu : 1; Eina_Bool pending_new_submenu : 1;
Eina_Bool have_submenu : 1; Eina_Bool have_submenu : 1;
Eina_Bool in_active_list : 1; Eina_Bool in_active_list : 1;
Eina_Bool solid : 1; // theme has data.item: "solid" "1"
}; };
struct _E_Menu_Item struct _E_Menu_Item