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

e: More y0 and y1 renaming to avoid global shadowing 

SVN revision: 72532
This commit is contained in:
Stefan Schmidt 2012-06-20 08:48:18 +00:00
parent ad68c5f2ec
commit fc52a4642d
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/e_place.c
View File

@ -67,7 +67,7 @@ _e_place_coverage_border_add(E_Desk *desk, Eina_List *skiplist, int ar, int x, i
int x2, y2, w2, h2;
int ok;
int iw, ih;
int x0, x00, y0, y00;
int x0, x00, yy0, y00;
bl = e_container_border_list_first(desk->zone->container);
while ((bd = e_container_border_list_next(bl)))
@ -90,12 +90,12 @@ _e_place_coverage_border_add(E_Desk *desk, Eina_List *skiplist, int ar, int x, i
if (x < x2) x0 = x2;
x00 = (x + w);
if ((x2 + w2) < (x + w)) x00 = (x2 + w2);
y0 = y;
if (y < y2) y0 = y2;
yy0 = y;
if (y < y2) yy0 = y2;
y00 = (y + h);
if ((y2 + h2) < (y + h)) y00 = (y2 + h2);
iw = x00 - x0;
ih = y00 - y0;
ih = y00 - yy0;
ar += (iw * ih);
}
}
@ -116,7 +116,7 @@ _e_place_coverage_shelf_add(E_Zone *zone, int ar, int x, int y, int w, int h)
x2 = es->x; y2 = es->y; w2 = es->w; h2 = es->h;
if (E_INTERSECTS(x, y, w, h, x2, y2, w2, h2))
{
int x0, x00, y0, y00;
int x0, x00, yy0, y00;
int iw, ih;
if (!es->cfg->overlap) return 0x7fffffff;
@ -124,12 +124,12 @@ _e_place_coverage_shelf_add(E_Zone *zone, int ar, int x, int y, int w, int h)
if (x < x2) x0 = x2;
x00 = (x + w);
if ((x2 + w2) < (x + w)) x00 = (x2 + w2);
y0 = y;
if (y < y2) y0 = y2;
yy0 = y;
if (y < y2) yy0 = y2;
y00 = (y + h);
if ((y2 + h2) < (y + h)) y00 = (y2 + h2);
iw = x00 - x0;
ih = y00 - y0;
ih = y00 - yy0;
ar += (iw * ih);
}
}

18
src/bin/e_zone.c
View File

@ -1226,12 +1226,12 @@ _e_zone_useful_geometry_calc(E_Zone *zone)
{
const Eina_List *l;
const E_Shelf *shelf;
int x0, x1, y0, y1;
int x0, x1, yy0, yy1;
x0 = 0;
y0 = 0;
yy0 = 0;
x1 = zone->w;
y1 = zone->h;
yy1 = zone->h;
EINA_LIST_FOREACH(e_shelf_list(), l, shelf)
{
E_Config_Shelf_Desk *sd;
@ -1281,15 +1281,15 @@ _e_zone_useful_geometry_calc(E_Zone *zone)
case E_GADCON_ORIENT_TOP:
case E_GADCON_ORIENT_CORNER_TL:
case E_GADCON_ORIENT_CORNER_TR:
if (y0 < shelf->h)
y0 = shelf->h;
if (yy0 < shelf->h)
yy0 = shelf->h;
break;
case E_GADCON_ORIENT_BOTTOM:
case E_GADCON_ORIENT_CORNER_BL:
case E_GADCON_ORIENT_CORNER_BR:
if (y1 > zone->h - shelf->h)
y1 = zone->h - shelf->h;
if (yy1 > zone->h - shelf->h)
yy1 = zone->h - shelf->h;
break;
break;
@ -1310,9 +1310,9 @@ _e_zone_useful_geometry_calc(E_Zone *zone)
}
zone->useful_geometry.x = zone->x + x0;
zone->useful_geometry.y = zone->y + y0;
zone->useful_geometry.y = zone->y + yy0;
zone->useful_geometry.w = x1 - x0;
zone->useful_geometry.h = y1 - y0;
zone->useful_geometry.h = yy1 - yy0;
zone->useful_geometry.dirty = 0;
}