From fe9c5f663c0984cc5c04d8c618fad98ec771f33a Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Thu, 10 Dec 2009 18:14:32 +0000
Subject: [PATCH] Handle conformant apps in both dual modes now.

SVN revision: 44343
---
 src/modules/illume2/e_mod_layout_illume.c | 32 ++++++++++++++++-------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/modules/illume2/e_mod_layout_illume.c b/src/modules/illume2/e_mod_layout_illume.c
index 73f2ad4aa..3be274ad7 100644
--- a/src/modules/illume2/e_mod_layout_illume.c
+++ b/src/modules/illume2/e_mod_layout_illume.c
@@ -16,15 +16,6 @@ _border_add(E_Border *bd)
    if (illume_border_is_top_shelf(bd)) return;
    if (illume_border_is_bottom_panel(bd)) return;
    if (illume_border_is_keyboard(bd)) return;
-   if (illume_border_is_conformant(bd)) 
-     {
-        E_Border *b;
-
-        b = illume_border_top_shelf_get();
-        if (b) e_border_fx_offset(b, 0, -shelfsize);
-        b = illume_border_bottom_panel_get();
-        if (b) e_border_fx_offset(b, 0, -panelsize);
-     }
    e_border_raise(bd);
    e_border_focus_set(bd, 1, 1);
 }
@@ -172,7 +163,19 @@ _zone_layout(E_Zone *z)
                        if ((b) && (bd != b)) 
                          by = by + bh;
                        else if (b) 
-                         by = bd->y;
+                         by = bd->fx.y;
+                       if (illume_border_is_conformant(bd)) 
+                         {
+                            by = z->y;
+                            bh = (z->h / 2);
+                            if ((b) && (bd != b)) 
+                              {
+                                 by = b->fx.y + b->h;
+                                 bh = (z->h - (b->fx.y + b->h));
+                              }
+                            else if (b) 
+                              by = bd->fx.y;
+                         }
                     }
                   else if (il_cfg->policy.mode.side == 1) /* left/right */
                     {
@@ -182,6 +185,15 @@ _zone_layout(E_Zone *z)
                          bx = bx + bw;
                        else if (b) 
                          bx = bd->x;
+                       if (illume_border_is_conformant(bd)) 
+                         {
+                            bx = z->x;
+                            by = z->y;
+                            bw = (z->w / 2);
+                            bh = z->h;
+                            if ((b) && (bd != b)) 
+                              bx = b->fx.x + b->w;
+                         }
                     }
                   if ((bd->w != bw) || (bd->h != bh))
                     e_border_resize(bd, bw, bh);