seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=cf1d853072a2b1642cd47a08e190c998d6ec7f32
commit cf1d853072a2b1642cd47a08e190c998d6ec7f32
Author: Daniel Juyung Seo <seojuyu...@gmail.com>
Date: Sun Dec 15 06:46:29 2013 +0900
elm_test: clean up some elm_object_focus_set() usage.
- moved around the code to gather the same objects together.
- removed unnecessary focus set to a wrong object.
---
src/bin/test_entry.c | 9 +++------
src/bin/test_entry_anchor.c | 3 +--
src/bin/test_image.c | 3 +--
src/bin/test_multibuttonentry.c | 1 -
4 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c
index ee462dc..e1fdb21 100644
--- a/src/bin/test_entry.c
+++ b/src/bin/test_entry.c
@@ -126,6 +126,7 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_inf
evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(bx, en);
evas_object_show(en);
+ elm_object_focus_set(en, EINA_TRUE);
bx2 = elm_box_add(win);
elm_box_horizontal_set(bx2, EINA_TRUE);
@@ -195,7 +196,6 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_inf
elm_box_pack_end(bx, bx2);
evas_object_show(bx2);
- elm_object_focus_set(en, EINA_TRUE);
evas_object_show(win);
}
@@ -536,9 +536,8 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void *
elm_box_pack_end(bx, bx2);
evas_object_show(bx2);
- evas_object_resize(win, 320, 300);
-
elm_object_focus_set(win, EINA_TRUE);
+ evas_object_resize(win, 320, 300);
evas_object_show(win);
}
@@ -757,15 +756,14 @@ test_entry_style_user(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void
en = elm_entry_add(win);
elm_entry_line_wrap_set(en, ELM_WRAP_MIXED);
-
elm_entry_text_style_user_push(en, "DEFAULT='font_size=40 color=#FF0000'");
elm_object_text_set(en, "Testing Text");
-
evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(bx, en);
evas_object_resize(en, 200, 200);
evas_object_show(en);
+ elm_object_focus_set(en, EINA_TRUE);
bt = elm_button_add(win);
evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -789,7 +787,6 @@ test_entry_style_user(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void
elm_object_focus_allow_set(bt2, 0);
evas_object_show(bt2);
- elm_object_focus_set(en, EINA_TRUE);
evas_object_show(win);
}
diff --git a/src/bin/test_entry_anchor.c b/src/bin/test_entry_anchor.c
index 1f5d5e7..d9c2b3d 100644
--- a/src/bin/test_entry_anchor.c
+++ b/src/bin/test_entry_anchor.c
@@ -230,8 +230,7 @@ test_entry_anchor(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *ev
evas_object_show(sc);
- evas_object_resize(win, 320, 300);
-
elm_object_focus_set(win, EINA_TRUE);
+ evas_object_resize(win, 320, 300);
evas_object_show(win);
}
diff --git a/src/bin/test_image.c b/src/bin/test_image.c
index 68a7075..c8ce58f 100644
--- a/src/bin/test_image.c
+++ b/src/bin/test_image.c
@@ -182,6 +182,7 @@ test_click_image(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *ev
evas_object_smart_callback_add(im, "clicked", _img_clicked_cb, im);
elm_box_pack_end(box, im);
evas_object_show(im);
+ elm_object_focus_set(im, EINA_TRUE);
label = elm_label_add(win);
elm_object_text_set(label, "<b>Press Return/Space/KP_Return key on image to
transit.</b>");
@@ -190,8 +191,6 @@ test_click_image(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *ev
elm_box_pack_end(box, label);
evas_object_show(label);
- elm_object_focus_set(im, EINA_TRUE);
-
evas_object_resize(win, 320, 480);
evas_object_show(win);
}
diff --git a/src/bin/test_multibuttonentry.c b/src/bin/test_multibuttonentry.c
index 5bae34d..6ba265f 100644
--- a/src/bin/test_multibuttonentry.c
+++ b/src/bin/test_multibuttonentry.c
@@ -220,5 +220,4 @@ test_multibuttonentry(void *data EINA_UNUSED,
evas_object_resize(win, 320, 480);
evas_object_show(win);
- elm_object_focus_set(sc, EINA_TRUE);
}
--
