If a border is conformant, set layer to above the bottom_panel (softkey).

SVN revision: 44120
This commit is contained in:
Christopher Michael 2009-12-02 18:33:05 +00:00
parent 6e58326749
commit cead02f0eb
1 changed files with 19 additions and 14 deletions

View File

@ -116,7 +116,14 @@ _zone_layout(E_Zone *z)
_border_calc_position(z, bd, &x, &y, &w, &h); _border_calc_position(z, bd, &x, &y, &w, &h);
e_border_move_resize(bd, x, y, w, h); e_border_move_resize(bd, x, y, w, h);
if (bd->layer != 100) e_border_layer_set(bd, 100); if (illume_border_is_conformant(bd))
{
if (bd->layer != 120) e_border_layer_set(bd, 120);
}
else
{
if (bd->layer != 100) e_border_layer_set(bd, 100);
}
} }
} }
} }
@ -132,23 +139,21 @@ static void
_border_calc_position(E_Zone *z, E_Border *bd, int *x, int *y, int *w, int *h) _border_calc_position(E_Zone *z, E_Border *bd, int *x, int *y, int *w, int *h)
{ {
if ((!z) || (!bd)) return; if ((!z) || (!bd)) return;
if (il_cfg->policy.mode.dual) if (x) *x = z->x;
if (y) *y = (z->y + shelfsize);
if (w) *w = z->w;
if (illume_border_is_conformant(bd))
{ {
if (h) *h = (z->h - shelfsize);
} }
else else
{ {
if (x) *x = z->x; if (h) *h = (z->h - shelfsize - panelsize);
if (y) *y = (z->y + shelfsize); }
if (w) *w = z->w; if (il_cfg->policy.mode.dual)
if (illume_border_is_conformant(bd)) {
{ /* we ignore config dialogs as we want them fullscreen in dual mode */
if (h) *h = (z->h - shelfsize); if (strstr(bd->client.icccm.class, "config")) return;
}
else
{
if (h) *h = (z->h - shelfsize - panelsize);
}
} }
} }