diff options
author | David Walter Seikel | 2014-05-11 13:34:49 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-11 13:34:49 +1000 |
commit | 041d246dfc219a0bb2e10345090a4ff9613b5920 (patch) | |
tree | 16530dbff036c15964e26ef28f68f76e66d3f501 /src/extantz/woMan.c | |
parent | Resize instead of mapping windows. Got the basics of a window manager in a f... (diff) | |
download | SledjHamr-041d246dfc219a0bb2e10345090a4ff9613b5920.zip SledjHamr-041d246dfc219a0bb2e10345090a4ff9613b5920.tar.gz SledjHamr-041d246dfc219a0bb2e10345090a4ff9613b5920.tar.bz2 SledjHamr-041d246dfc219a0bb2e10345090a4ff9613b5920.tar.xz |
Change internal windows from Elm win to Elm layout.
Diffstat (limited to '')
-rw-r--r-- | src/extantz/woMan.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c index 6167cb1..7e476ea 100644 --- a/src/extantz/woMan.c +++ b/src/extantz/woMan.c | |||
@@ -160,7 +160,6 @@ winFang *woMan_add(globals *ourGlobals) | |||
160 | int i; | 160 | int i; |
161 | 161 | ||
162 | me = winFangAdd(ourGlobals->mainWindow, 30, 200, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "virtual world manager", "woMan", ourGlobals->world); | 162 | me = winFangAdd(ourGlobals->mainWindow, 30, 200, ourGlobals->win_w / 3, ourGlobals->win_h / 3, "virtual world manager", "woMan", ourGlobals->world); |
163 | useBox(me); | ||
164 | 163 | ||
165 | // A tab thingy. | 164 | // A tab thingy. |
166 | tb = elm_toolbar_add(me->win); | 165 | tb = elm_toolbar_add(me->win); |
@@ -185,7 +184,7 @@ winFang *woMan_add(globals *ourGlobals) | |||
185 | 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); |
186 | 185 | ||
187 | // 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. |
188 | elm_box_pack_end(me->box, tb); | 187 | elm_layout_box_append(me->win, BOX, tb); |
189 | evas_object_show(tb); | 188 | evas_object_show(tb); |
190 | 189 | ||
191 | gridList = elm_genlist_add(me->win); | 190 | gridList = elm_genlist_add(me->win); |
@@ -268,7 +267,7 @@ winFang *woMan_add(globals *ourGlobals) | |||
268 | 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); |
269 | 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); |
270 | 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); |
271 | elm_box_pack_end(me->box, nf); | 270 | elm_layout_box_append(me->win, BOX, nf); |
272 | 271 | ||
273 | bt = eo_add(ELM_OBJ_BUTTON_CLASS, me->win, | 272 | bt = eo_add(ELM_OBJ_BUTTON_CLASS, me->win, |
274 | // evas_obj_text_set("Login"), | 273 | // evas_obj_text_set("Login"), |
@@ -278,9 +277,8 @@ winFang *woMan_add(globals *ourGlobals) | |||
278 | ); | 277 | ); |
279 | 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. |
280 | // evas_object_smart_callback_add(bt, "clicked", NULL, NULL); | 279 | // evas_object_smart_callback_add(bt, "clicked", NULL, NULL); |
281 | elm_box_pack_end(me->box, bt); | 280 | elm_layout_box_append(me->win, BOX, bt); |
282 | eo_unref(bt); | 281 | eo_unref(bt); |
283 | evas_object_show(me->box); | ||
284 | 282 | ||
285 | return me; | 283 | return me; |
286 | } | 284 | } |