From 12fcc3075e3eb035e3d7fefb30c1d087a312bc48 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Tue, 6 May 2014 23:24:58 +1000 Subject: All winFangs now get a complimentary box. --- src/extantz/woMan.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/extantz/woMan.c') 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) winFang *woMan_add(globals *ourGlobals) { winFang *me; - Evas_Object *bx, *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; + Evas_Object *bt, *nf, *tab, *tb, *gridList, *viewerList, *menu; Elm_Object_Item *tb_it, *menu_it, *tab_it; char buf[PATH_MAX]; int i; me = winFangAdd(ourGlobals->mainWindow, 30, 150, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "virtual world manager", "woMan"); - bx = elm_box_add(me->win); - elm_win_resize_object_add(me->win, bx); - evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); - // A tab thingy. tb = elm_toolbar_add(me->win); evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, 0.0); @@ -189,7 +184,7 @@ winFang *woMan_add(globals *ourGlobals) elm_menu_item_add(menu, menu_it, NULL, "debug settings", NULL, NULL); // The toolbar needs to be packed into the box AFTER the menus are added. - elm_box_pack_end(bx, tb); + elm_box_pack_end(me->box, tb); evas_object_show(tb); gridList = elm_genlist_add(me->win); @@ -272,7 +267,7 @@ winFang *woMan_add(globals *ourGlobals) 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); 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); 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); - elm_box_pack_end(bx, nf); + elm_box_pack_end(me->box, nf); bt = eo_add(ELM_OBJ_BUTTON_CLASS, me->win, // evas_obj_text_set("Login"), @@ -282,9 +277,9 @@ winFang *woMan_add(globals *ourGlobals) ); elm_object_text_set(bt, "Login"); // No eo interface for this that I can find. // evas_object_smart_callback_add(bt, "clicked", NULL, NULL); - elm_box_pack_end(bx, bt); + elm_box_pack_end(me->box, bt); eo_unref(bt); - evas_object_show(bx); + evas_object_show(me->box); return me; } -- cgit v1.1