From ab84521773e2f2ddbf9f515e728508f1f454c8f7 Mon Sep 17 00:00:00 2001 From: Woochan Lee Date: Sat, 10 Dec 2016 15:24:26 +0900 Subject: [PATCH] Tab view is not ready to land yet. Change-Id: I97a57248dfad7a67a4f62b597382dd09a30a5299 --- src/examples/efl/c/CMakeLists.txt | 2 +- src/examples/efl/c/main.h | 1 - src/examples/efl/c/page16.cpp | 6 +++++- src/examples/efl/cpp/main.cpp | 1 - src/examples/efl/cpp/page16.h | 2 +- src/include/efl/mobile/c/ui_mobile_viewmanager.h | 4 ++-- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/examples/efl/c/CMakeLists.txt b/src/examples/efl/c/CMakeLists.txt index b8a8e9c..b8e476e 100644 --- a/src/examples/efl/c/CMakeLists.txt +++ b/src/examples/efl/c/CMakeLists.txt @@ -17,7 +17,7 @@ SET(SRCS page14.cpp page15.cpp page16.cpp - page17.cpp +#page17.cpp ) ADD_EXECUTABLE(${BINNAME} ${SRCS}) diff --git a/src/examples/efl/c/main.h b/src/examples/efl/c/main.h index 9480a79..9f41b12 100644 --- a/src/examples/efl/c/main.h +++ b/src/examples/efl/c/main.h @@ -55,4 +55,3 @@ void create_page13(); void create_page14(); void create_page15(); void create_page16(); -void create_page17(); diff --git a/src/examples/efl/c/page16.cpp b/src/examples/efl/c/page16.cpp index 4a5e9f0..08f3097 100644 --- a/src/examples/efl/c/page16.cpp +++ b/src/examples/efl/c/page16.cpp @@ -30,7 +30,11 @@ prev_btn_clicked_cb(void *data, Eo *obj, void *event_info) static void next_btn_clicked_cb(void *data, Eo *obj, void *event_info) { - create_page17(); + int ret = ui_viewmgr_deactivate(); + if (ret != UI_VIEWMGR_ERROR_NONE) + { + dlog_print(DLOG_ERROR, LOG_TAG, "ui_viewmgr_deactivate() is failed. err = %d", ret); + } } static void diff --git a/src/examples/efl/cpp/main.cpp b/src/examples/efl/cpp/main.cpp index ab45133..6d6e782 100644 --- a/src/examples/efl/cpp/main.cpp +++ b/src/examples/efl/cpp/main.cpp @@ -15,7 +15,6 @@ * */ #include "main.h" -#include "page17.h" #include "page16.h" #include "page15.h" #include "page14.h" diff --git a/src/examples/efl/cpp/page16.h b/src/examples/efl/cpp/page16.h index 226a563..5bb2494 100644 --- a/src/examples/efl/cpp/page16.h +++ b/src/examples/efl/cpp/page16.h @@ -35,7 +35,7 @@ protected: //Next Button Callback [](void *data, Eo *obj, void *event_info) { - UI_VIEWMGR->pushView(new page17()); + UI_VIEWMGR->deactivate(); }, //Title Show Button Callback [](void *data, Eo *obj, void *event_info) diff --git a/src/include/efl/mobile/c/ui_mobile_viewmanager.h b/src/include/efl/mobile/c/ui_mobile_viewmanager.h index 855829c..37c5076 100644 --- a/src/include/efl/mobile/c/ui_mobile_viewmanager.h +++ b/src/include/efl/mobile/c/ui_mobile_viewmanager.h @@ -40,7 +40,7 @@ typedef struct ui_view_s ui_view; typedef ui_view ui_standard_view; -typedef ui_view ui_tab_view; +//typedef ui_view ui_tab_view; typedef struct ui_menu_s ui_menu; typedef struct ui_popup_s ui_popup; @@ -54,6 +54,6 @@ typedef struct ui_popup_s ui_popup; #include "ui_viewmgr.h" #include "ui_view.h" #include "ui_standard_view.h" -#include "ui_tab_view.h" +//#include "ui_tab_view.h" #endif /* UI_MOBILE_VIEWMANAGER_CAPI_H */ -- 2.34.1