Layout fixes for conformant windows (wrt keyboard).

SVN revision: 45936
This commit is contained in:
Christopher Michael 2010-02-06 17:14:40 +00:00
parent 63c874d7a6
commit c466a427b3
1 changed files with 8 additions and 8 deletions

View File

@ -332,7 +332,7 @@ _zone_layout_single(E_Border *bd)
ny = ky + ss; ny = ky + ss;
if (e_illume_border_is_conformant(bd)) if (e_illume_border_is_conformant(bd))
{ {
nh = kh; nh = bd->zone->h;
ny = ky; ny = ky;
} }
if ((bd->w != kw) || (bd->h != nh)) if ((bd->w != kw) || (bd->h != nh))
@ -393,7 +393,7 @@ _zone_layout_dual_top(E_Border *bd)
if (conform) if (conform)
{ {
by = ky; by = ky;
bh += ss; bh = bd->zone->h / 2;
} }
else if (e_illume_border_is_home(bd)) else if (e_illume_border_is_home(bd))
by = (b->y + b->h); by = (b->y + b->h);
@ -401,12 +401,12 @@ _zone_layout_dual_top(E_Border *bd)
else if (e_illume_border_is_conformant(b)) else if (e_illume_border_is_conformant(b))
{ {
by = (b->y + b->h); by = (b->y + b->h);
if (conform) bh += ps; if (conform) bh = bd->zone->h / 2;
} }
else else
{ {
by = (b->y + b->h); by = (b->y + b->h);
if (conform) bh += ps; if (conform) bh = bd->zone->h / 2;
} }
} }
else if (b) else if (b)
@ -572,7 +572,7 @@ _zone_layout_dual_left(E_Border *bd)
if (conform) if (conform)
{ {
by = ky; by = ky;
bh += ps + ss; bh = bd->zone->h;
} }
else if (e_illume_border_is_home(bd)) else if (e_illume_border_is_home(bd))
bx = (b->x + b->w); bx = (b->x + b->w);
@ -583,7 +583,7 @@ _zone_layout_dual_left(E_Border *bd)
if (conform) if (conform)
{ {
by = ky; by = ky;
bh += ps + ss; bh = bd->zone->h;
} }
} }
else else
@ -592,7 +592,7 @@ _zone_layout_dual_left(E_Border *bd)
if (conform) if (conform)
{ {
by = ky; by = ky;
bh += ps + ss; bh = bd->zone->h;
} }
} }
} }
@ -601,7 +601,7 @@ _zone_layout_dual_left(E_Border *bd)
if (bd->client.vkbd.state > ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF) if (bd->client.vkbd.state > ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)
{ {
by = (ky + ss); by = (ky + ss);
bh = ((kh - ss - ps) / 2); bh = (kh - ss - ps);
} }
} }