When using "fill available space", take into account if the border is on the

current desk or not. This fixes bug #113.

Fix minor formatting issue in e_border.c


SVN revision: 30915
This commit is contained in:
Christopher Michael 2007-07-20 08:27:59 +00:00
parent 24eab9731b
commit e0e2492e00
2 changed files with 2 additions and 6 deletions

View File

@ -611,10 +611,7 @@ e_border_zone_set(E_Border *bd, E_Zone *zone)
bd->zone = zone;
if (bd->desk->zone != bd->zone)
{
e_border_desk_set(bd, e_desk_current_get(bd->zone));
}
e_border_desk_set(bd, e_desk_current_get(bd->zone));
ev = calloc(1, sizeof(E_Event_Border_Zone_Set));
ev->border = bd;

View File

@ -160,8 +160,7 @@ e_maximize_border_border_fill(E_Border *bd, int *x1, int *y1, int *x2, int *y2,
bl = e_container_border_list_first(bd->zone->container);
while ((bd2 = e_container_border_list_next(bl)))
{
if ((bd2->zone != bd->zone) ||
(bd == bd2))
if ((bd2->zone != bd->zone) || (bd == bd2) || (bd2->desk != bd->desk))
continue;
OBSTACLE(bd2->x, bd2->y, bd2->x + bd2->w, bd2->y + bd2->h);
}