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

edje: rename variable 

Give variable a name which better describes its purpose.
This commit is contained in:
Sebastian Dransfeld 2015-05-11 12:21:54 +02:00
parent 4a4d5f2705
commit 3433c1449e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -566,7 +566,7 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
{
Edje_Part_Description_Common *epd1;
Edje_Part_Description_Common *epd2 = NULL;
Edje_Part_Description_Common *chosen_desc;
Edje_Part_Description_Common *last_desc;
Eina_Bool change_w, change_h;
Edje_Part_Description_Image *epdi;
@ -624,13 +624,13 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
ep->param2 = NULL;
}
chosen_desc = ep->chosen_description;
last_desc = ep->chosen_description;
ep->param1.description = epd1;
ep->chosen_description = epd1;
if (chosen_desc)
if (last_desc)
{
change_w = ep->chosen_description->fixed.w != chosen_desc->fixed.w;
change_h = ep->chosen_description->fixed.h != chosen_desc->fixed.h;
change_w = ep->chosen_description->fixed.w != last_desc->fixed.w;
change_h = ep->chosen_description->fixed.h != last_desc->fixed.h;
}
_edje_real_part_rel_to_apply(ed, ep, &ep->param1);
@ -644,18 +644,18 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
ep->chosen_description = epd2;
}
if (chosen_desc != ep->chosen_description)
if (last_desc != ep->chosen_description)
{
if (ep->part->type == EDJE_PART_TYPE_EXTERNAL)
_edje_external_recalc_apply(ed, ep, NULL, chosen_desc);
else if ((chosen_desc) && (ep->part->type == EDJE_PART_TYPE_GROUP))
_edje_external_recalc_apply(ed, ep, NULL, last_desc);
else if ((last_desc) && (ep->part->type == EDJE_PART_TYPE_GROUP))
{
Edje_Size *min, *max, *pmin, *pmax;
min = &ep->chosen_description->min;
max = &ep->chosen_description->max;
pmin = &chosen_desc->min;
pmax = &chosen_desc->max;
pmin = &last_desc->min;
pmax = &last_desc->max;
if (change_w || change_h ||
(((pmin->w == pmax->w) && (pmin->h == pmax->h) && (pmin->w > 0) && (pmin->h > 0)) &&
(((min->w != max->w) || (min->h != max->h) || (min->w <= 0) || (min->h <= 0)))))