diff options
Diffstat (limited to '')
-rw-r--r-- | src/extantz/chat.c | 15 | ||||
-rw-r--r-- | src/extantz/files.c | 18 | ||||
-rw-r--r-- | src/extantz/woMan.c | 15 | ||||
-rw-r--r-- | src/libraries/winFang.c | 9 | ||||
-rw-r--r-- | src/libraries/winFang.h | 1 |
5 files changed, 24 insertions, 34 deletions
diff --git a/src/extantz/chat.c b/src/extantz/chat.c index 4c18e53..c19b936 100644 --- a/src/extantz/chat.c +++ b/src/extantz/chat.c | |||
@@ -14,16 +14,10 @@ winFang *chat_add(globals *ourGlobals) | |||
14 | { | 14 | { |
15 | winFang *me; | 15 | winFang *me; |
16 | Widget *wid; | 16 | Widget *wid; |
17 | Evas_Object *bx, *en; | 17 | Evas_Object *en; |
18 | 18 | ||
19 | me = winFangAdd(ourGlobals->mainWindow, 30, 520, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "chatter box", "chat"); | 19 | me = winFangAdd(ourGlobals->mainWindow, 30, 520, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "chatter box", "chat"); |
20 | 20 | ||
21 | bx = eo_add(ELM_OBJ_BOX_CLASS, me->win, | ||
22 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | ||
23 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL) | ||
24 | ); | ||
25 | elm_win_resize_object_add(me->win, bx); | ||
26 | |||
27 | en = eo_add(ELM_OBJ_ENTRY_CLASS, me->win, | 21 | en = eo_add(ELM_OBJ_ENTRY_CLASS, me->win, |
28 | elm_obj_entry_scrollable_set(EINA_TRUE), | 22 | elm_obj_entry_scrollable_set(EINA_TRUE), |
29 | elm_obj_entry_editable_set(EINA_FALSE), | 23 | elm_obj_entry_editable_set(EINA_FALSE), |
@@ -32,7 +26,7 @@ winFang *chat_add(globals *ourGlobals) | |||
32 | evas_obj_visibility_set(EINA_TRUE) | 26 | evas_obj_visibility_set(EINA_TRUE) |
33 | ); | 27 | ); |
34 | elm_object_text_set(en, "History is shown here"); | 28 | elm_object_text_set(en, "History is shown here"); |
35 | elm_box_pack_end(bx, en); | 29 | elm_box_pack_end(me->box, en); |
36 | eo_unref(en); | 30 | eo_unref(en); |
37 | 31 | ||
38 | wid = widgetAdd(me, ELM_OBJ_ENTRY_CLASS, me->win, ""); | 32 | wid = widgetAdd(me, ELM_OBJ_ENTRY_CLASS, me->win, ""); |
@@ -41,10 +35,9 @@ winFang *chat_add(globals *ourGlobals) | |||
41 | elm_obj_entry_scrollable_set(EINA_TRUE), | 35 | elm_obj_entry_scrollable_set(EINA_TRUE), |
42 | elm_obj_entry_editable_set(EINA_TRUE) | 36 | elm_obj_entry_editable_set(EINA_TRUE) |
43 | ); | 37 | ); |
44 | elm_box_pack_end(bx, wid->obj); | 38 | elm_box_pack_end(me->box, wid->obj); |
45 | 39 | ||
46 | evas_object_show(bx); | 40 | evas_object_show(me->box); |
47 | eo_unref(bx); | ||
48 | 41 | ||
49 | return me; | 42 | return me; |
50 | } | 43 | } |
diff --git a/src/extantz/files.c b/src/extantz/files.c index 948c261..7dd08fa 100644 --- a/src/extantz/files.c +++ b/src/extantz/files.c | |||
@@ -144,18 +144,11 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
144 | { | 144 | { |
145 | winFang *me; | 145 | winFang *me; |
146 | Widget *wid; | 146 | Widget *wid; |
147 | Evas_Object *bx, *vbox, *fs, *bt, *rd = NULL, *rdg = NULL, *hoversel; | 147 | Evas_Object *vbox, *fs, *bt, *rd = NULL, *rdg = NULL, *hoversel; |
148 | 148 | ||
149 | me = winFangAdd(ourGlobals->mainWindow, ourGlobals->win_w - 380, ourGlobals->win_w - 530, 350, 500, "file selector", "files"); | 149 | me = winFangAdd(ourGlobals->mainWindow, ourGlobals->win_w - 380, ourGlobals->win_w - 530, 350, 500, "file selector", "files"); |
150 | 150 | ||
151 | bx = eo_add(ELM_OBJ_BOX_CLASS, me->win, | 151 | wid = widgetAdd(me, ELM_OBJ_FILESELECTOR_CLASS, me->box, NULL); |
152 | elm_obj_box_homogeneous_set(EINA_FALSE), | ||
153 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | ||
154 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL) | ||
155 | ); | ||
156 | elm_win_resize_object_add(me->win, bx); | ||
157 | |||
158 | wid = widgetAdd(me, ELM_OBJ_FILESELECTOR_CLASS, bx, NULL); | ||
159 | fs = wid->obj; | 152 | fs = wid->obj; |
160 | wid->data = ourGlobals; | 153 | wid->data = ourGlobals; |
161 | wid->on_del = _on_fs_del; | 154 | wid->on_del = _on_fs_del; |
@@ -165,7 +158,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
165 | elm_interface_fileselector_expandable_set(EINA_TRUE), | 158 | elm_interface_fileselector_expandable_set(EINA_TRUE), |
166 | elm_interface_fileselector_folder_only_set(EINA_FALSE) | 159 | elm_interface_fileselector_folder_only_set(EINA_FALSE) |
167 | ); | 160 | ); |
168 | elm_box_pack_end(bx, fs); | 161 | elm_box_pack_end(me->box, fs); |
169 | 162 | ||
170 | elm_fileselector_path_set(fs, path); | 163 | elm_fileselector_path_set(fs, path); |
171 | elm_fileselector_is_save_set(fs, save); | 164 | elm_fileselector_is_save_set(fs, save); |
@@ -271,11 +264,10 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
271 | elm_box_pack_end(vbox, bt); | 264 | elm_box_pack_end(vbox, bt); |
272 | eo_unref(bt); | 265 | eo_unref(bt); |
273 | 266 | ||
274 | elm_box_pack_end(bx, vbox); | 267 | elm_box_pack_end(me->box, vbox); |
275 | evas_object_show(vbox); | 268 | evas_object_show(vbox); |
276 | evas_object_show(bx); | 269 | evas_object_show(me->box); |
277 | eo_unref(vbox); | 270 | eo_unref(vbox); |
278 | eo_unref(bx); | ||
279 | 271 | ||
280 | winFangHide(me); | 272 | winFangHide(me); |
281 | return me; | 273 | return me; |
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c index 8215253..cd1d5c8 100644 --- a/src/extantz/woMan.c +++ b/src/extantz/woMan.c | |||
@@ -154,18 +154,13 @@ static void _grid_sel_cb(void *data, Evas_Object *obj, void *event_info) | |||
154 | winFang *woMan_add(globals *ourGlobals) | 154 | winFang *woMan_add(globals *ourGlobals) |
155 | { | 155 | { |
156 | winFang *me; | 156 | winFang *me; |
157 | Evas_Object *bx, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; | 157 | Evas_Object *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; |
158 | Elm_Object_Item *tb_it, *menu_it, *tab_it; | 158 | Elm_Object_Item *tb_it, *menu_it, *tab_it; |
159 | char buf[PATH_MAX]; | 159 | char buf[PATH_MAX]; |
160 | int i; | 160 | int i; |
161 | 161 | ||
162 | me = winFangAdd(ourGlobals->mainWindow, 30, 150, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "virtual world manager", "woMan"); | 162 | me = winFangAdd(ourGlobals->mainWindow, 30, 150, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "virtual world manager", "woMan"); |
163 | 163 | ||
164 | bx = elm_box_add(me->win); | ||
165 | elm_win_resize_object_add(me->win, bx); | ||
166 | evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | ||
167 | evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); | ||
168 | |||
169 | // A tab thingy. | 164 | // A tab thingy. |
170 | tb = elm_toolbar_add(me->win); | 165 | tb = elm_toolbar_add(me->win); |
171 | evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, 0.0); | 166 | evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, 0.0); |
@@ -189,7 +184,7 @@ winFang *woMan_add(globals *ourGlobals) | |||
189 | elm_menu_item_add(menu, menu_it, NULL, "debug settings", NULL, NULL); | 184 | elm_menu_item_add(menu, menu_it, NULL, "debug settings", NULL, NULL); |
190 | 185 | ||
191 | // The toolbar needs to be packed into the box AFTER the menus are added. | 186 | // The toolbar needs to be packed into the box AFTER the menus are added. |
192 | elm_box_pack_end(bx, tb); | 187 | elm_box_pack_end(me->box, tb); |
193 | evas_object_show(tb); | 188 | evas_object_show(tb); |
194 | 189 | ||
195 | gridList = elm_genlist_add(me->win); | 190 | gridList = elm_genlist_add(me->win); |
@@ -272,7 +267,7 @@ winFang *woMan_add(globals *ourGlobals) | |||
272 | tab = viewerList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Viewers", _promote, tab_it); | 267 | tab = viewerList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Viewers", _promote, tab_it); |
273 | tab = _content_image_new(me->win, strdup(buf)); tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Landmarks", _promote, tab_it); | 268 | tab = _content_image_new(me->win, strdup(buf)); tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Landmarks", _promote, tab_it); |
274 | tab = gridList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Grids", _promote, tab_it); | 269 | tab = gridList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Grids", _promote, tab_it); |
275 | elm_box_pack_end(bx, nf); | 270 | elm_box_pack_end(me->box, nf); |
276 | 271 | ||
277 | bt = eo_add(ELM_OBJ_BUTTON_CLASS, me->win, | 272 | bt = eo_add(ELM_OBJ_BUTTON_CLASS, me->win, |
278 | // evas_obj_text_set("Login"), | 273 | // evas_obj_text_set("Login"), |
@@ -282,9 +277,9 @@ winFang *woMan_add(globals *ourGlobals) | |||
282 | ); | 277 | ); |
283 | elm_object_text_set(bt, "Login"); // No eo interface for this that I can find. | 278 | elm_object_text_set(bt, "Login"); // No eo interface for this that I can find. |
284 | // evas_object_smart_callback_add(bt, "clicked", NULL, NULL); | 279 | // evas_object_smart_callback_add(bt, "clicked", NULL, NULL); |
285 | elm_box_pack_end(bx, bt); | 280 | elm_box_pack_end(me->box, bt); |
286 | eo_unref(bt); | 281 | eo_unref(bt); |
287 | evas_object_show(bx); | 282 | evas_object_show(me->box); |
288 | 283 | ||
289 | return me; | 284 | return me; |
290 | } | 285 | } |
diff --git a/src/libraries/winFang.c b/src/libraries/winFang.c index c6b019a..a52d01c 100644 --- a/src/libraries/winFang.c +++ b/src/libraries/winFang.c | |||
@@ -163,6 +163,14 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch | |||
163 | ); | 163 | ); |
164 | elm_win_resize_object_add(result->win, result->bg); | 164 | elm_win_resize_object_add(result->win, result->bg); |
165 | 165 | ||
166 | // Every window gets a free vertical box. | ||
167 | // TODO - Any widgets created without positon and size get packed to the end. | ||
168 | result->box = eo_add(ELM_OBJ_BOX_CLASS, result->win, | ||
169 | elm_obj_box_homogeneous_set(EINA_FALSE), | ||
170 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | ||
171 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL) | ||
172 | ); | ||
173 | elm_win_resize_object_add(result->win, result->box); | ||
166 | 174 | ||
167 | evas_object_resize(result->win, result->w, result->h); | 175 | evas_object_resize(result->win, result->w, result->h); |
168 | evas_object_show(result->win); | 176 | evas_object_show(result->win); |
@@ -177,6 +185,7 @@ void winFangDel(winFang *win) | |||
177 | 185 | ||
178 | if (!win) return; | 186 | if (!win) return; |
179 | 187 | ||
188 | eo_unref(win->box); | ||
180 | eo_unref(win->bg); | 189 | eo_unref(win->bg); |
181 | EINA_CLIST_FOR_EACH_ENTRY(wf, &win->winFangs, winFang, node) | 190 | EINA_CLIST_FOR_EACH_ENTRY(wf, &win->winFangs, winFang, node) |
182 | { | 191 | { |
diff --git a/src/libraries/winFang.h b/src/libraries/winFang.h index 93ff9b1..05c3036 100644 --- a/src/libraries/winFang.h +++ b/src/libraries/winFang.h | |||
@@ -19,6 +19,7 @@ typedef struct _winFang | |||
19 | { | 19 | { |
20 | Evas_Object *win; | 20 | Evas_Object *win; |
21 | Evas_Object *bg; | 21 | Evas_Object *bg; |
22 | Evas_Object *box; | ||
22 | Eina_Clist widgets; | 23 | Eina_Clist widgets; |
23 | Eina_Clist winFangs; | 24 | Eina_Clist winFangs; |
24 | int x, y, w, h; | 25 | int x, y, w, h; |