[demo] add back button in some cases

Change-Id: Ie2608c4a6c83bea2015e2221a1f3bb4af349548c

diff --git a/ism/demos/include/isf_demo_efl.h b/ism/demos/include/isf_demo_efl.h
index 99e9362..37fd193 100644 (file)
--- a/ism/demos/include/isf_demo_efl.h
+++ b/ism/demos/include/isf_demo_efl.h
@@ -60,7 +60,9 @@ struct appdata {
 
 // Utility functions
 Evas_Object *create_ef (Evas_Object *parent, const char *label, const char *guide_text, Evas_Object **entry = NULL);
-void         add_layout_to_naviframe (void *data, Evas_Object *lay_in, const char *title);
+Evas_Object *create_button (Evas_Object *parent, const char *text);
+Elm_Object_Item *add_layout_to_naviframe (void *data, Evas_Object *lay_in, const char *title);
+Evas_Object *create_naviframe_back_button (struct appdata *ad);
 
 #endif /* __ISF_DEMO_EFL_H */
 

diff --git a/ism/demos/isf_demo_efl.cpp b/ism/demos/isf_demo_efl.cpp
index 0e50612..1fd4d30 100644 (file)
--- a/ism/demos/isf_demo_efl.cpp
+++ b/ism/demos/isf_demo_efl.cpp
@@ -410,6 +410,17 @@ Evas_Object *create_ef (Evas_Object *parent, const char *label, const char *guid
     return bx;
 }
 
+Evas_Object *create_button (Evas_Object *parent, const char *text)
+{
+    Evas_Object *btn = elm_button_add (parent);
+    elm_object_text_set (btn, text);
+    evas_object_size_hint_weight_set (btn, EVAS_HINT_EXPAND, 0.0);
+    evas_object_size_hint_align_set (btn, EVAS_HINT_FILL, 0.0);
+    evas_object_show (btn);
+
+    return btn;
+}
+
 static void _back_btn_clicked_cb (void *data, Evas_Object *obj, void *event_info)
 {
     struct appdata *ad = (struct appdata *)data;
@@ -419,7 +430,18 @@ static void _back_btn_clicked_cb (void *data, Evas_Object *obj, void *event_info
     }
 }
 
-void add_layout_to_naviframe (void *data, Evas_Object *lay_in, const char *title)
+Evas_Object *create_naviframe_back_button (struct appdata *ad)
+{
+    Evas_Object *back_btn = elm_button_add (ad->naviframe);
+    if (!elm_object_style_set (back_btn, "naviframe/end_btn/default"))
+        LOGW ("Failed to set style of button\n");
+
+    evas_object_smart_callback_add (back_btn, "clicked",  _back_btn_clicked_cb, ad);
+
+    return back_btn;
+}
+
+Elm_Object_Item *add_layout_to_naviframe (void *data, Evas_Object *lay_in, const char *title)
 {
     struct appdata *ad = (struct appdata *) data;
 
@@ -429,14 +451,8 @@ void add_layout_to_naviframe (void *data, Evas_Object *lay_in, const char *title
 
     elm_object_content_set (scroller, lay_in);
 
-    // create back key
-    Evas_Object *back_btn = elm_button_add (ad->naviframe);
-    if (!elm_object_style_set (back_btn, "naviframe/end_btn/default"))
-        LOGW ("Failed to set style of button\n");
-
-    evas_object_smart_callback_add (back_btn, "clicked",  _back_btn_clicked_cb, ad);
-
-    elm_naviframe_item_push (ad->naviframe, title, back_btn, NULL, scroller, NULL);
+    Evas_Object *back_btn = create_naviframe_back_button (ad);
+    return elm_naviframe_item_push (ad->naviframe, title, back_btn, NULL, scroller, NULL);
 }
 
 /*

diff --git a/ism/demos/isf_entry_event_efl.cpp b/ism/demos/isf_entry_event_efl.cpp
index de20bb3..71d4ee1 100644 (file)
--- a/ism/demos/isf_entry_event_efl.cpp
+++ b/ism/demos/isf_entry_event_efl.cpp
@@ -96,57 +96,55 @@ static Eina_Bool _ecore_imf_event_commit_cb (void *data, int type, void *event)
 void isf_entry_event_demo_bt (void *data, Evas_Object *obj, void *event_info)
 {
     struct appdata *ad = (struct appdata *)data;
-    Evas_Object *layout = NULL;
     Ecore_IMF_Context *ic = NULL;
 
-    layout = elm_layout_add (ad->naviframe);
-    evas_object_size_hint_weight_set (layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_show (layout);
+    Evas_Object *bx = elm_box_add (ad->naviframe);
+    evas_object_size_hint_weight_set (bx, EVAS_HINT_EXPAND, 0.0);
+    evas_object_size_hint_align_set (bx, EVAS_HINT_FILL, 0.0);
+    evas_object_show (bx);
 
     _preedit_handler = ecore_event_handler_add (ECORE_IMF_EVENT_PREEDIT_CHANGED, _ecore_imf_event_changed_cb, NULL);
     _commit_handler  = ecore_event_handler_add (ECORE_IMF_EVENT_COMMIT, _ecore_imf_event_commit_cb, NULL);
 
-    _entry1 = elm_entry_add (layout);
+    /* Entry 1 */
+    _entry1 = elm_entry_add (bx);
     elm_entry_entry_set (_entry1, "ENTRY 1");
-    evas_object_move (_entry1, 0, 100);
-    evas_object_resize (_entry1, ad->root_w, 50);
+    evas_object_size_hint_weight_set (_entry1, EVAS_HINT_EXPAND, 0.0);
+    evas_object_size_hint_align_set (_entry1, EVAS_HINT_FILL, 0.0);
     evas_object_show (_entry1);
     evas_object_event_callback_add (_entry1, EVAS_CALLBACK_KEY_UP, _evas_key_up_cb, (void *)NULL);
+    elm_box_pack_end (bx, _entry1);
 
     ic = (Ecore_IMF_Context *)elm_entry_imf_context_get (_entry1);
     if (ic != NULL)
         ecore_imf_context_input_panel_event_callback_add (ic, ECORE_IMF_INPUT_PANEL_STATE_EVENT, _input_panel_event_callback, NULL);
 
-    _entry2 = elm_entry_add (layout);
+    /* Entry 2 */
+    _entry2 = elm_entry_add (bx);
     elm_entry_entry_set (_entry2, "ENTRY 2");
-    evas_object_move (_entry2, 0, 150);
-    evas_object_resize (_entry2, ad->root_w, 50);
+    evas_object_size_hint_weight_set (_entry2, EVAS_HINT_EXPAND, 0.0);
+    evas_object_size_hint_align_set (_entry2, EVAS_HINT_FILL, 0.0);
     evas_object_show (_entry2);
     evas_object_event_callback_add (_entry2, EVAS_CALLBACK_KEY_UP, _evas_key_up_cb, (void *)NULL);
+    elm_box_pack_end (bx, _entry2);
 
     ic = (Ecore_IMF_Context *)elm_entry_imf_context_get (_entry2);
     if (ic != NULL)
         ecore_imf_context_input_panel_event_callback_add (ic, ECORE_IMF_INPUT_PANEL_STATE_EVENT, _input_panel_event_callback, NULL);
 
-    _key_event_label = elm_button_add (layout);
-    elm_object_text_set (_key_event_label, "KEY EVENT");
-    evas_object_move (_key_event_label, 0, 200);
-    evas_object_resize (_key_event_label, ad->root_w, 50);
-    evas_object_show (_key_event_label);
-
-    _preedit_event_label = elm_button_add (layout);
-    elm_object_text_set (_preedit_event_label, "PREEDIT EVENT");
-    evas_object_move (_preedit_event_label, 0, 250);
-    evas_object_resize (_preedit_event_label, ad->root_w, 50);
-    evas_object_show (_preedit_event_label);
-
-    _commit_event_label = elm_button_add (layout);
-    elm_object_text_set (_commit_event_label, "COMMIT EVENT");
-    evas_object_move (_commit_event_label, 0, 300);
-    evas_object_resize (_commit_event_label, ad->root_w, 50);
-    evas_object_show (_commit_event_label);
-
-    elm_naviframe_item_push (ad->naviframe, _("Entry Event"), NULL, NULL, layout, NULL);
+    /* key event */
+    _key_event_label = create_button (bx, "KEY EVENT");
+    elm_box_pack_end (bx, _key_event_label);
+
+    /* preedit event */
+    _preedit_event_label = create_button (bx, "PREEDIT EVENT");
+    elm_box_pack_end (bx, _preedit_event_label);
+
+    /* commit event */
+    _commit_event_label = create_button (bx, "COMMIT EVENT");
+    elm_box_pack_end (bx, _commit_event_label);
+
+    add_layout_to_naviframe (ad, bx, _("Entry Event"));
 }
 
 /*

diff --git a/ism/demos/isf_event_efl.cpp b/ism/demos/isf_event_efl.cpp
index 1ca9e36..8c914f8 100644 (file)
--- a/ism/demos/isf_event_efl.cpp
+++ b/ism/demos/isf_event_efl.cpp
@@ -38,7 +38,7 @@ static Ecore_Event_Handler *_preedit_handler = NULL;
 static Ecore_Event_Handler *_commit_handler  = NULL;
 static int focus_label_idx = 1;
 
-void isf_entry_event_demo_bt (void *data, Evas_Object *obj, void *event_info);
+extern void isf_entry_event_demo_bt (void *data, Evas_Object *obj, void *event_info);
 
 static void _set_focus_button_bt (void *data, Evas_Object *obj, void *event_info)
 {
@@ -151,13 +151,14 @@ static Eina_Bool _nf_back_event_cb (void *data, Elm_Object_Item *it)
 static void isf_label_event_demo_bt (void *data, Evas_Object *obj, void *event_info)
 {
     struct appdata *ad = (struct appdata *)data;
-    Evas_Object *layout = NULL;
     Evas *evas = NULL;
     Ecore_Window ecore_win;
 
-    layout = elm_layout_add (ad->naviframe);
-    evas_object_size_hint_weight_set (layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_show (layout);
+    Evas_Object *bx;
+    bx = elm_box_add (ad->naviframe);
+    evas_object_size_hint_weight_set (bx, EVAS_HINT_EXPAND, 0.0);
+    evas_object_size_hint_align_set (bx, EVAS_HINT_FILL, 0.0);
+    evas_object_show (bx);
 
     evas = evas_object_evas_get (ad->win_main);
     ecore_win = ecore_evas_window_get (ecore_evas_ecore_evas_get (evas));
@@ -169,31 +170,32 @@ static void isf_label_event_demo_bt (void *data, Evas_Object *obj, void *event_i
     /* register commit event handler */
     _commit_handler = ecore_event_handler_add (ECORE_IMF_EVENT_COMMIT, _ecore_imf_event_commit_cb, NULL);
 
-    /* create label2 */
-    _label1 = elm_label_add (layout);
+    /* create label1 */
+    _label1 = elm_label_add (bx);
     elm_object_text_set (_label1, "LABEL 1");
-    evas_object_move (_label1, 0, 100);
-    evas_object_resize (_label1, ad->root_w, 50);
+    evas_object_size_hint_weight_set (_label1, EVAS_HINT_EXPAND, 0.0);
+    evas_object_size_hint_align_set (_label1, EVAS_HINT_FILL, 0.0);
     evas_object_show (_label1);
     evas_object_event_callback_add (_label1, EVAS_CALLBACK_KEY_UP, _key_up_cb, (void *)NULL);
     evas_object_event_callback_add (_label1, EVAS_CALLBACK_KEY_DOWN, _key_down_cb, (void *)NULL);
+    elm_box_pack_end (bx, _label1);
 
     /* create input context for label1 */
     _imf_context[0] = ecore_imf_context_add (ctx_id);
     if (_imf_context[0]) {
-        ecore_imf_context_client_window_set (_imf_context[0], (void *)ecore_win);
         ecore_imf_context_client_canvas_set (_imf_context[0], evas_object_evas_get (_label1));
         ecore_imf_context_focus_in (_imf_context[0]);
     }
 
     /* create label2 */
-    _label2 = elm_label_add (layout);
+    _label2 = elm_label_add (bx);
     elm_object_text_set (_label2, "LABEL 2");
-    evas_object_move (_label2, 0, 150);
-    evas_object_resize (_label2, ad->root_w, 50);
+    evas_object_size_hint_weight_set (_label2, EVAS_HINT_EXPAND, 0.0);
+    evas_object_size_hint_align_set (_label2, EVAS_HINT_FILL, 0.0);
     evas_object_show (_label2);
     evas_object_event_callback_add (_label2, EVAS_CALLBACK_KEY_UP, _key_up_cb, (void *)NULL);
     evas_object_event_callback_add (_label2, EVAS_CALLBACK_KEY_DOWN, _key_down_cb, (void *)NULL);
+    elm_box_pack_end (bx, _label2);
 
     /* create input context for label2 */
     _imf_context[1] = ecore_imf_context_add (ctx_id);
@@ -202,46 +204,28 @@ static void isf_label_event_demo_bt (void *data, Evas_Object *obj, void *event_i
         ecore_imf_context_client_canvas_set (_imf_context[1], evas_object_evas_get (_label2));
     }
 
-    _key_event_label = elm_button_add (layout);
-    elm_object_text_set (_key_event_label, "KEY EVENT");
-    evas_object_move (_key_event_label, 0, 200);
-    evas_object_resize (_key_event_label, ad->root_w, 50);
-    evas_object_show (_key_event_label);
-
-    _preedit_event_label = elm_button_add (layout);
-    elm_object_text_set (_preedit_event_label, "PREEDIT EVENT");
-    evas_object_move (_preedit_event_label, 0, 250);
-    evas_object_resize (_preedit_event_label, ad->root_w, 50);
-    evas_object_show (_preedit_event_label);
-
-    _commit_event_label = elm_button_add (layout);
-    elm_object_text_set (_commit_event_label, "COMMIT EVENT");
-    evas_object_move (_commit_event_label, 0, 300);
-    evas_object_resize (_commit_event_label, ad->root_w, 50);
-    evas_object_show (_commit_event_label);
-
-    _set_focus_button1 = elm_button_add (layout);
-    elm_object_text_set (_set_focus_button1, "SET FOCUS TO LABEL 1");
-    evas_object_move (_set_focus_button1, 0, 350);
-    evas_object_resize (_set_focus_button1, ad->root_w, 50);
-    evas_object_show (_set_focus_button1);
+    _key_event_label = create_button (bx, "KEY EVENT");
+    elm_box_pack_end (bx, _key_event_label);
+
+    _preedit_event_label = create_button (bx, "PREEDIT EVENT");
+    elm_box_pack_end (bx, _preedit_event_label);
+
+    _commit_event_label = create_button (bx, "COMMIT EVENT");
+    elm_box_pack_end (bx, _commit_event_label);
+
+    _set_focus_button1 = create_button (bx, "SET FOCUS TO LABEL 1");
     evas_object_smart_callback_add (_set_focus_button1, "clicked", _set_focus_button_bt, (void *)1);
+    elm_box_pack_end (bx, _set_focus_button1);
 
-    _set_focus_button2 = elm_button_add (layout);
-    elm_object_text_set (_set_focus_button2, "SET FOCUS TO LABEL 2");
-    evas_object_move (_set_focus_button2, 0, 400);
-    evas_object_resize (_set_focus_button2, ad->root_w, 50);
-    evas_object_show (_set_focus_button2);
+    _set_focus_button2 = create_button (bx, "SET FOCUS TO LABEL 2");
     evas_object_smart_callback_add (_set_focus_button2, "clicked", _set_focus_button_bt, (void *)2);
+    elm_box_pack_end (bx, _set_focus_button2);
 
-    _ise_show_button = elm_button_add (layout);
-    elm_object_text_set (_ise_show_button, "ISE SHOW");
-    evas_object_move (_ise_show_button, 0, 450);
-    evas_object_resize (_ise_show_button, ad->root_w, 50);
-    evas_object_show (_ise_show_button);
+    _ise_show_button = create_button (bx, "ISE SHOW");
     evas_object_smart_callback_add (_ise_show_button, "clicked", _button_bt, NULL);
+    elm_box_pack_end (bx, _ise_show_button);
 
-    Elm_Object_Item *it = elm_naviframe_item_push (ad->naviframe, _("Label Event"), NULL, NULL, layout, NULL);
+    Elm_Object_Item *it = add_layout_to_naviframe (ad, bx, _("Label Event"));
     if (it)
         elm_naviframe_item_pop_cb_set (it, _nf_back_event_cb, ad);
 }
@@ -281,12 +265,7 @@ void isf_event_demo_bt (void *data, Evas_Object *obj, void *event_info)
     elm_list_go (ad->ev_li);
 
     // create back key
-    Evas_Object *back_btn = elm_button_add (ad->naviframe);
-    if (!elm_object_style_set (back_btn, "naviframe/end_btn/default"))
-        LOGW ("Failed to set style of button\n");
-
-    evas_object_smart_callback_add (back_btn, "clicked",  _back_btn_clicked_cb, ad);
-
+    Evas_Object *back_btn = create_naviframe_back_button (ad);
     elm_naviframe_item_push (ad->naviframe, _("Event"), back_btn, NULL, ad->ev_li, NULL);
 }
 

diff --git a/ism/demos/isf_imcontrol_efl.cpp b/ism/demos/isf_imcontrol_efl.cpp
index 8abcbeb..56c4635 100644 (file)
--- a/ism/demos/isf_imcontrol_efl.cpp
+++ b/ism/demos/isf_imcontrol_efl.cpp
@@ -368,7 +368,8 @@ void imcontrolapi_bt (void *data, Evas_Object *obj, void *event_info)
 
     gl = _create_imcontrolapi_list (ad->naviframe);
 
-    Elm_Object_Item *navi_it = elm_naviframe_item_push (ad->naviframe, _("IM Control"), NULL, NULL, gl, NULL);
+    Evas_Object *back_btn = create_naviframe_back_button (ad);
+    Elm_Object_Item *navi_it = elm_naviframe_item_push (ad->naviframe, _("IM Control"), back_btn, NULL, gl, NULL);
     elm_naviframe_item_pop_cb_set (navi_it, _nf_back_event_cb, ad);
 }
 

diff --git a/ism/demos/isf_layout_efl.cpp b/ism/demos/isf_layout_efl.cpp
index 78bfc7f..993bd8e 100644 (file)
--- a/ism/demos/isf_layout_efl.cpp
+++ b/ism/demos/isf_layout_efl.cpp
@@ -268,23 +268,15 @@ static Evas_Object * create_inner_layout (void *data)
 
 #ifndef WAYLAND
     /* create back key event generation button */
-    Evas_Object *back_key_btn = elm_button_add (parent);
-    elm_object_text_set (back_key_btn, "Generate BACK key");
+    Evas_Object *back_key_btn = create_button (parent, "Generate BACK key");
     evas_object_smart_callback_add (back_key_btn, "clicked", _back_key_cb, (void *)ad);
-    evas_object_size_hint_weight_set (back_key_btn, EVAS_HINT_EXPAND, 0.0);
-    evas_object_size_hint_align_set (back_key_btn, EVAS_HINT_FILL, 0);
-    evas_object_show (back_key_btn);
     elm_box_pack_end (bx, back_key_btn);
     elm_object_focus_allow_set (back_key_btn, EINA_FALSE);
 #endif
 
     /* Click to rotate button */
-    Evas_Object *rotate_btn = elm_button_add (parent);
-    elm_object_text_set (rotate_btn, "rotate");
+    Evas_Object *rotate_btn = create_button (parent, "rotate");
     evas_object_smart_callback_add (rotate_btn, "clicked", _rotate_cb, (void *)ad);
-    evas_object_size_hint_weight_set (rotate_btn, EVAS_HINT_EXPAND, 0.0);
-    evas_object_size_hint_align_set (rotate_btn, EVAS_HINT_FILL, 0);
-    evas_object_show (rotate_btn);
     elm_box_pack_end (bx, rotate_btn);
 
 #ifndef WAYLAND