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

Don't move_resize a border if the dimensions are already set. 

SVN revision: 44232
This commit is contained in:
Christopher Michael 2009-12-07 00:32:39 +00:00
parent bda24a1f0d
commit a50456436b
1 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/modules/illume2/e_mod_layout_illume.c
View File

@ -17,8 +17,8 @@ static void
_border_add(E_Border *bd)
{ // handle a border being added
if (illume_border_is_top_shelf(bd)) return;
else if (illume_border_is_bottom_panel(bd)) return;
else if (illume_border_is_keyboard(bd)) return;
if (illume_border_is_bottom_panel(bd)) return;
if (illume_border_is_keyboard(bd)) return;
e_border_raise(bd);
e_border_focus_set(bd, 1, 1);
}
@ -26,15 +26,7 @@ _border_add(E_Border *bd)
static void
_border_del(E_Border *bd)
{ // handle a border being deleted
if (illume_border_is_conformant(bd))
{
E_Border *b;
b = illume_border_top_shelf_get();
if (b) e_border_show(b);
b = illume_border_bottom_panel_get();
if (b) e_border_show(b);
}
}
static void
@ -93,35 +85,56 @@ _zone_layout(E_Zone *z)
illume_border_min_get(bd, &mw, &mh);
if (illume_border_is_top_shelf(bd))
{
e_border_move_resize(bd, z->x, z->y, z->w, shelfsize);
if ((bd->x != z->x) || (bd->y != z->y) || (bd->w != z->w) ||
(bd->h != shelfsize))
e_border_move_resize(bd, z->x, z->y, z->w, shelfsize);
e_border_stick(bd);
}
else if (illume_border_is_bottom_panel(bd))
{
e_border_move_resize(bd, z->x, z->y + z->h - panelsize, z->w, panelsize);
if ((bd->x != z->x) || (bd->y != (z->y + z->h - panelsize)) ||
(bd->w != z->w) || (bd->h != panelsize))
e_border_move_resize(bd, z->x, z->y + z->h - panelsize,
z->w, panelsize);
e_border_stick(bd);
}
else if (illume_border_is_keyboard(bd))
{
e_border_move_resize(bd, z->x, z->y + z->h - kbdsize, z->w, kbdsize);
if ((bd->x != z->x) || (bd->y != (z->y + z->h - kbdsize)) ||
(bd->w != z->w) || (bd->h != kbdsize))
e_border_move_resize(bd, z->x, z->y + z->h - kbdsize,
z->w, kbdsize);
}
else if (illume_border_is_home(bd))
{
e_border_move_resize(bd, z->x, z->y + shelfsize, z->w,
z->h - shelfsize - panelsize);
if ((bd->x != z->x) || (bd->y != z->y + shelfsize) ||
(bd->w != z->w) || (bd->h != (z->h - shelfsize - panelsize)))
e_border_move_resize(bd, z->x, z->y + shelfsize, z->w,
z->h - shelfsize - panelsize);
}
else if (illume_border_is_dialog(bd))
{
if (mh > z->h) mh = z->h;
e_border_move_resize(bd, z->x, z->y + ((z->h - mh) / 2), z->w, mh);
if ((bd->x != z->x) || (bd->y != (z->y + ((z->h - mh) / 2))) ||
(bd->w != z->w) || (bd->h != mh))
e_border_move_resize(bd, z->x, z->y + ((z->h - mh) / 2),
z->w, mh);
}
else
{
if (illume_border_is_conformant(bd))
e_border_move_resize(bd, z->x, z->y, z->w, z->h);
{
if ((bd->x != z->x) || (bd->y != z->y) ||
(bd->w != z->w) || (bd->h != z->h))
e_border_move_resize(bd, z->x, z->y, z->w, z->h);
}
else
e_border_move_resize(bd, z->x, z->y + shelfsize, z->w,
z->h - shelfsize - panelsize);
{
if ((bd->x != z->x) || (bd->y != z->y + shelfsize) ||
(bd->w != z->w) || (bd->h != z->h - shelfsize - panelsize))
e_border_move_resize(bd, z->x, z->y + shelfsize, z->w,
z->h - shelfsize - panelsize);
}
}
}
}