From fd753bf90b8f529b0f95b93cb187103286a3f9ac Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 4 May 2014 22:36:06 +1000
Subject: Fold some common code into widgetAdd, and related cleanups.

---
 src/extantz/chat.c    | 14 ++++----------
 src/extantz/extantz.h |  4 +++-
 src/extantz/fangWin.c | 12 +++++++++++-
 src/extantz/files.c   | 12 ++++--------
 4 files changed, 22 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/extantz/chat.c b/src/extantz/chat.c
index d5e492e..e814842 100644
--- a/src/extantz/chat.c
+++ b/src/extantz/chat.c
@@ -35,19 +35,13 @@ fangWin *chat_add(globals *ourGlobals)
   elm_box_pack_end(bx, en);
   eo_unref(en);
 
-  en = eo_add(ELM_OBJ_ENTRY_CLASS, me->win);
-  wid = widgetAdd(me);
-  wid->obj = en;
+  wid = widgetAdd(me, ELM_OBJ_ENTRY_CLASS, me->win, "");
   wid->on_del = _on_entry_del;
-  elm_object_text_set(en, "");
-  eo_do(en,
+  eo_do(wid->obj,
     elm_obj_entry_scrollable_set(EINA_TRUE),
-    elm_obj_entry_editable_set(EINA_TRUE),
-    evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
-    evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL),
-    evas_obj_visibility_set(EINA_TRUE)
+    elm_obj_entry_editable_set(EINA_TRUE)
        );
-  elm_box_pack_end(bx, en);
+  elm_box_pack_end(bx, wid->obj);
 
   evas_object_show(bx);
   eo_unref(bx);
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h
index 84ebcba..a4001c7 100644
--- a/src/extantz/extantz.h
+++ b/src/extantz/extantz.h
@@ -242,6 +242,8 @@ typedef struct _globals
   GLData gld;
   Scene_Data	*scene;
 
+  Eina_Clist	windows;
+
   fangWin	*files;
 } globals;
 
@@ -273,7 +275,7 @@ fangWin *fang_win_add(globals *ourGlobals);
 void fang_win_complete(globals *ourGlobals, fangWin *win, int x, int y, int w, int h);
 void fang_win_del(globals *ourGlobals, fangWin *win);
 void overlay_add(globals *ourGlobals);
-Widget *widgetAdd(fangWin *win);
+Widget *widgetAdd(fangWin *win, const Eo_Class *klass, Evas_Object *parent, char *title);
 
 fangWin *chat_add(globals *ourGlobals);
 fangWin *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save);
diff --git a/src/extantz/fangWin.c b/src/extantz/fangWin.c
index 7a9f0d5..88a5c00 100644
--- a/src/extantz/fangWin.c
+++ b/src/extantz/fangWin.c
@@ -174,7 +174,7 @@ void overlay_add(globals *ourGlobals)
   evas_object_show(gld->winwin);
 }
 
-Widget *widgetAdd(fangWin *win)
+Widget *widgetAdd(fangWin *win, const Eo_Class *klass, Evas_Object *parent, char *title)
 {
   Widget *result;
 
@@ -182,5 +182,15 @@ Widget *widgetAdd(fangWin *win)
   strcpy(result->magic, "Widget");
   eina_clist_add_head(&win->widgets, &result->node);
 
+  if (parent)
+  {
+    result->obj = eo_add(klass, parent,
+      evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
+      evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL),
+      evas_obj_visibility_set(EINA_TRUE)
+    );
+    if (title)  elm_object_text_set(result->obj, title);
+  }
+
   return result;
 }
diff --git a/src/extantz/files.c b/src/extantz/files.c
index 06cd257..816894f 100644
--- a/src/extantz/files.c
+++ b/src/extantz/files.c
@@ -155,19 +155,15 @@ fangWin *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa
   );
   elm_win_resize_object_add(me->win, bx);
 
-  fs = eo_add(ELM_OBJ_FILESELECTOR_CLASS, bx);
-  me->data = fs;
-  wid = widgetAdd(me);
-  wid->obj = fs;
+  wid = widgetAdd(me, ELM_OBJ_FILESELECTOR_CLASS, bx, NULL);
+  fs = wid->obj;
   wid->data = ourGlobals;
   wid->on_del = _on_fs_del;
+  me->data = fs;
   eo_do(fs,
-    evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
-    evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL),
     elm_obj_fileselector_buttons_ok_cancel_set(EINA_FALSE),
     elm_interface_fileselector_expandable_set(EINA_TRUE),
-    elm_interface_fileselector_folder_only_set(EINA_FALSE),
-    evas_obj_visibility_set(EINA_TRUE)
+    elm_interface_fileselector_folder_only_set(EINA_FALSE)
        );
   elm_box_pack_end(bx, fs);
 
-- 
cgit v1.1