okra pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=37faad3e26c5a4c43bda86126dc4dbcb269b9bc8
commit 37faad3e26c5a4c43bda86126dc4dbcb269b9bc8 Author: Stephen Houston <[email protected]> Date: Sun Jan 25 16:47:58 2015 -0600 Ephoto: Use overlap style on naviframe --- src/bin/ephoto.h | 3 +++ src/bin/ephoto_main.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h index c2d4973..419179e 100644 --- a/src/bin/ephoto.h +++ b/src/bin/ephoto.h @@ -114,6 +114,9 @@ struct _Ephoto Evas_Object *thumb_browser; Evas_Object *single_browser; Evas_Object *slideshow; + Elm_Object_Item *tb; + Elm_Object_Item *sb; + Elm_Object_Item *sl; Eina_List *entries; Eina_List *direntries; diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c index 4eb1a9f..6c2ceaf 100644 --- a/src/bin/ephoto_main.c +++ b/src/bin/ephoto_main.c @@ -26,7 +26,7 @@ _ephoto_thumb_browser_show(Ephoto *ephoto, Ephoto_Entry *entry) ephoto_single_browser_entry_set(ephoto->single_browser, NULL); ephoto_slideshow_entry_set(ephoto->slideshow, NULL); - elm_naviframe_item_simple_promote(ephoto->pager, ephoto->thumb_browser); + elm_naviframe_item_promote(ephoto->tb); elm_object_focus_set(ephoto->thumb_browser, EINA_TRUE); _ephoto_state_set(ephoto, EPHOTO_STATE_THUMB); ephoto_title_set(ephoto, ephoto->config->directory); @@ -197,7 +197,8 @@ ephoto_window_add(const char *path) evas_object_del(ephoto->win); return NULL; } - elm_naviframe_item_simple_push(ephoto->pager, ephoto->thumb_browser); + ephoto->tb = elm_naviframe_item_push(ephoto->pager, NULL, NULL, NULL, ephoto->thumb_browser, "overlap"); + elm_naviframe_item_title_enabled_set(ephoto->tb, EINA_FALSE, EINA_FALSE); evas_object_smart_callback_add (ephoto->thumb_browser, "view", _ephoto_thumb_browser_view, ephoto); evas_object_smart_callback_add @@ -214,7 +215,9 @@ ephoto_window_add(const char *path) evas_object_del(ephoto->win); return NULL; } - elm_naviframe_item_simple_push(ephoto->pager, ephoto->single_browser); + ephoto->sb = elm_naviframe_item_insert_after(ephoto->pager, ephoto->tb, + NULL, NULL, NULL, ephoto->single_browser, "overlap"); + elm_naviframe_item_title_enabled_set(ephoto->sb, EINA_FALSE, EINA_FALSE); evas_object_smart_callback_add (ephoto->single_browser, "back", _ephoto_single_browser_back, ephoto); evas_object_smart_callback_add @@ -228,7 +231,9 @@ ephoto_window_add(const char *path) evas_object_del(ephoto->win); return NULL; } - elm_naviframe_item_simple_push(ephoto->pager, ephoto->slideshow); + ephoto->sl = elm_naviframe_item_insert_after(ephoto->pager, ephoto->sb, + NULL, NULL, NULL, ephoto->slideshow, "overlap"); + elm_naviframe_item_title_enabled_set(ephoto->sl, EINA_FALSE, EINA_FALSE); evas_object_smart_callback_add (ephoto->slideshow, "back", _ephoto_slideshow_back, ephoto); --
