Add a rectangle to pad out those that don't use the winFang box, and have them make their widdgets relative to that.

6 files changed, 27 insertions, 1 deletions

diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c
index 09c3fe9..2e16927 100644
--- a/src/GuiLua/GuiLua.c
+++ b/src/GuiLua/GuiLua.c
@@ -175,10 +175,13 @@ static int widget(lua_State *L)
   winFang *win = NULL;
   char *type = "button";
   char *title = ":";
-  int x = 1, y = 1, w = WIDTH/3, h = HEIGHT/3;
+  int x = 1, y = 1, w = WIDTH/3, h = HEIGHT/3, cy;
 
   pull_lua(L, 1, "*window $type $title %x %y %w %h", &win, &type, &title, &x, &y, &w, &h);
 
+  evas_object_geometry_get(win->content, NULL, &cy, NULL, NULL);
+  y += cy;
+
   // Poor mans introspection, until I write real introspection into EFL.
   // TODO - The alternative is to just lookup the ELM_*_CLASS in a hash table?
   if (strcmp(type, "button") == 0)
diff --git a/src/extantz/files.c b/src/extantz/files.c
index 3aeb7f9..6ac151d 100644
--- a/src/extantz/files.c
+++ b/src/extantz/files.c
@@ -147,6 +147,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
   Evas_Object *vbox, *fs, *bt, *rd = NULL, *rdg = NULL, *hoversel;
 
   me = winFangAdd(ourGlobals->mainWindow, ourGlobals->win_w - 380, ourGlobals->win_w - 530, 350, 500, "file selector", "files", ourGlobals->world);
+  useBox(me);
 
   wid = widgetAdd(me, ELM_OBJ_FILESELECTOR_CLASS, me->box, NULL);
   fs = wid->obj;
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c
index 52b3a30..6167cb1 100644
--- a/src/extantz/woMan.c
+++ b/src/extantz/woMan.c
@@ -160,6 +160,7 @@ winFang *woMan_add(globals *ourGlobals)
     int i;
 
     me = winFangAdd(ourGlobals->mainWindow, 30, 200, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "virtual world manager", "woMan", ourGlobals->world);
+    useBox(me);
 
     // A tab thingy.
     tb = elm_toolbar_add(me->win);
diff --git a/src/libraries/winFang.c b/src/libraries/winFang.c
index bcf99ce..5f5b575 100644
--- a/src/libraries/winFang.c
+++ b/src/libraries/winFang.c
@@ -262,6 +262,14 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch
       );
     elm_box_pack_end(result->box, obj1);
     eo_unref(obj1);
+
+    result->content = eo_add(EVAS_OBJ_RECTANGLE_CLASS, result->win,
+        evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL),
+        evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
+        evas_obj_color_set(0, 0, 0, 0),
+        evas_obj_visibility_set(EINA_TRUE)
+      );
+    elm_box_pack_end(result->box, result->content);
   }
 
   evas_object_resize(result->win, result->w, result->h);
@@ -277,6 +285,7 @@ void winFangDel(winFang *win)
 
   if (!win)  return;
 
+  eo_unref(win->content);
   eo_unref(win->box);
   eo_unref(win->bg);
   EINA_CLIST_FOR_EACH_ENTRY(wf, &win->winFangs, winFang, node)
@@ -294,6 +303,15 @@ void winFangDel(winFang *win)
   evas_object_del(win->win);
 }
 
+void useBox(winFang *win)
+{
+  eo_do(win->content,
+    evas_obj_visibility_set(EINA_FALSE),
+    evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0),
+    evas_obj_size_set(0, 0)
+  );
+}
+
 Widget *widgetAdd(winFang *win, const Eo_Class *klass, Evas_Object *parent, char *title)
 {
   Widget *result;
diff --git a/src/libraries/winFang.h b/src/libraries/winFang.h
index f3b4e45..17cf942 100644
--- a/src/libraries/winFang.h
+++ b/src/libraries/winFang.h
@@ -24,6 +24,7 @@ typedef struct _winFang
   Evas_Object   *title;
   Evas_Object   *bg;
   Evas_Object   *box;
+  Evas_Object   *content;
   EPhysics_Body *body;
   Eina_Clist    widgets;
   Eina_Clist    winFangs;
@@ -58,6 +59,7 @@ void winFangHide(winFang *win);
 void winFangShow(winFang *win);
 void winFangDel(winFang *win);
 
+void useBox(winFang *win);
 Widget *widgetAdd(winFang *win, const Eo_Class *klass, Evas_Object *parent, char *title);
 
 #endif
diff --git a/src/purkle/purkle.c b/src/purkle/purkle.c
index ef0bbf2..6538096 100644
--- a/src/purkle/purkle.c
+++ b/src/purkle/purkle.c
@@ -20,6 +20,7 @@ static winFang *purkleAdd(winFang *parent, int w, int h, EPhysics_World *world)
   Evas_Object *en;
 
   me = winFangAdd(parent, 30, 590, w, h, "chatter box", "purkle", world);
+  useBox(me);
 
   en = eo_add(ELM_OBJ_ENTRY_CLASS, me->win,
     elm_obj_entry_scrollable_set(EINA_TRUE),