Make policy handle if top shelf, bottom panel, etc, are sticky.

SVN revision: 44086

diff --git a/src/modules/illume2/e_mod_layout_illume.c b/src/modules/illume2/e_mod_layout_illume.c
index f1549135d87fca788ca657d66e2d0f5354da8e3a..ec4e201d79c45207cf44436dcff45db3429e643b 100644 (file)
--- a/src/modules/illume2/e_mod_layout_illume.c
+++ b/src/modules/illume2/e_mod_layout_illume.c
@@ -1,5 +1,6 @@
 #include "e.h"
 #include "e_mod_main.h"
+#include "e_mod_config.h"
 #include "e_mod_layout.h"
 #include "e_mod_layout_illume.h"
 
@@ -77,11 +78,13 @@ _zone_layout(E_Zone *z)
         if (illume_border_is_top_shelf(bd))
           {
              e_border_move_resize(bd, z->x, z->y, z->w, shelfsize);
+             e_border_stick(bd);
              if (bd->layer != 200) e_border_layer_set(bd, 200);
           }
         else if (illume_border_is_bottom_panel(bd))
           {
              e_border_move_resize(bd, z->x, z->y + z->h - panelsize, z->w, panelsize);
+             e_border_stick(bd);
              if (bd->layer != 100) e_border_layer_set(bd, 100);
           }
         else if (illume_border_is_keyboard(bd))
@@ -102,7 +105,14 @@ _zone_layout(E_Zone *z)
           }
         else
           {
-             e_border_move_resize(bd, z->x, z->y + shelfsize, z->w, z->h - shelfsize - kbdsize);
+             if (il_cfg->policy.mode.dual)
+               {
+                  /* determine where to place this border based on if any 
+                   * other borders are present, and also based on what the 
+                   * current policy 'side' is set to */
+               }
+             else
+               e_border_move_resize(bd, z->x, z->y + shelfsize, z->w, z->h - shelfsize - kbdsize);
              if (bd->layer != 100) e_border_layer_set(bd, 100);
           }
      }