aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/illume2/policies/illume/layout.c
diff options
context:
space:
mode:
authorChristopher Michael <cpmichael1@comcast.net>2010-01-26 10:16:29 +0000
committerChristopher Michael <cpmichael1@comcast.net>2010-01-26 10:16:29 +0000
commitf435b6322c723b3daf9389049a25bd1e8d7b3f47 (patch)
treeacd8bba5485da8d8e7919092ee765bb2f3e0351f /src/modules/illume2/policies/illume/layout.c
parentfaf294b37abf1ca7fbc9575ca0cb861b843e6d95 (diff)
downloadenlightenment-f435b6322c723b3daf9389049a25bd1e8d7b3f47.tar.gz
enlightenment-f435b6322c723b3daf9389049a25bd1e8d7b3f47.tar.xz
enlightenment-f435b6322c723b3daf9389049a25bd1e8d7b3f47.zip
Allow conformant windows to work with vkbd in single layout mode (need to
handle dual mode still). SVN revision: 45579
Diffstat (limited to 'src/modules/illume2/policies/illume/layout.c')
-rw-r--r--src/modules/illume2/policies/illume/layout.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/modules/illume2/policies/illume/layout.c b/src/modules/illume2/policies/illume/layout.c
index 04dab22e0..ea98e7f8e 100644
--- a/src/modules/illume2/policies/illume/layout.c
+++ b/src/modules/illume2/policies/illume/layout.c
@@ -260,16 +260,11 @@ _zone_layout_single(E_Border *bd)
int ss = 0, ps = 0;
e_illume_kbd_safe_app_region_get(bd->zone, &kx, &ky, &kw, &kh);
- if (!e_illume_border_is_conformant(bd))
+ if (!((bd->need_fullscreen) || (bd->fullscreen)))
{
- if (!((bd->need_fullscreen) || (bd->fullscreen)))
- {
- if (kh >= bd->zone->h) ps = panelsize;
- ss = shelfsize;
- }
+ if (kh >= bd->zone->h) ps = panelsize;
+ ss = shelfsize;
}
- else
- kh = bd->zone->h;
if ((bd->w != kw) || (bd->h != (kh - ss - ps)))
_zone_layout_border_resize(bd, kw, (kh - ss - ps));
if ((bd->x != kx) || (bd->y != (ky + ss)))
@@ -313,6 +308,7 @@ _zone_layout_dual_top(E_Border *bd)
ss = shelfsize;
}
}
+
if (e_illume_border_valid_count_get(bd->zone) < 2)
{
if ((bd->w != kw) || (bd->h != (kh - ss - ps)))