enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

edje - use Eina_Bool

This commit is contained in:
ChunEon Park 2013-06-04 14:42:52 +09:00
parent 86f37578fa
commit d3e1cb055a
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/edje/edje_calc.c
View File

@ -3636,34 +3636,34 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
}
// handle smooth
if (chosen_desc->map.smooth) evas_map_smooth_set(map, 1);
else evas_map_smooth_set(map, 0);
if (chosen_desc->map.smooth) evas_map_smooth_set(map, EINA_TRUE);
else evas_map_smooth_set(map, EINA_FALSE);
// handle alpha
if (chosen_desc->map.alpha) evas_map_alpha_set(map, 1);
else evas_map_alpha_set(map, 0);
if (chosen_desc->map.alpha) evas_map_alpha_set(map, EINA_TRUE);
else evas_map_alpha_set(map, EINA_FALSE);
if (ep->nested_smart)
{ /* Apply map to smart obj holding nested parts */
eo_do(ep->nested_smart,
evas_obj_map_set(map),
evas_obj_map_enable_set(1));
eo_do(ep->nested_smart,
evas_obj_map_set(map),
evas_obj_map_enable_set(EINA_TRUE));
}
else
{
if (mo)
eo_do(mo,
evas_obj_map_set(map),
evas_obj_map_enable_set(1));
evas_obj_map_enable_set(EINA_TRUE));
}
}
else
{
if (ep->nested_smart)
{ /* Cancel map of smart obj holding nested parts */
eo_do(ep->nested_smart,
evas_obj_map_enable_set(0),
evas_obj_map_set(NULL));
eo_do(ep->nested_smart,
evas_obj_map_enable_set(EINA_FALSE),
evas_obj_map_set(NULL));
}
else
{

12
src/lib/edje/edje_edit.c
View File

@ -3038,12 +3038,12 @@ edje_edit_state_add(Evas_Object *obj, const char *part, const char *name, double
pd->map.rot.x = FROM_DOUBLE(0.0);
pd->map.rot.y = FROM_DOUBLE(0.0);
pd->map.rot.z = FROM_DOUBLE(0.0);
pd->map.on = 0;
pd->map.smooth = 1;
pd->map.alpha = 1;
pd->map.backcull = 0;
pd->map.persp_on = 0;
pd->persp.zplane = 0;
pd->map.on = EINA_FALSE;
pd->map.smooth = EINA_TRUE;
pd->map.alpha = EINA_TRUE;
pd->map.backcull = EINA_FALSE;
pd->map.persp_on = EINA_FALSE;
pd->persp.zplane = EINA_FALSE;
pd->persp.focal = 1000;
if (rp->part->type == EDJE_PART_TYPE_TEXT

10
src/lib/edje/edje_private.h
View File

@ -1036,11 +1036,11 @@ struct _Edje_Part_Description_Common
int id_center;
FLOAT_T x, y, z;
} rot;
unsigned char backcull;
unsigned char on;
unsigned char persp_on;
unsigned char smooth;
unsigned char alpha;
Eina_Bool backcull;
Eina_Bool on;
Eina_Bool persp_on;
Eina_Bool smooth;
Eina_Bool alpha;
} map;
struct {