seoz pushed a commit to branch master.
commit 97bf47b2ade3c18a32ef7d54848aab1c342741f4
Author: Daniel Juyung Seo <[email protected]>
Date: Wed Jun 19 01:22:13 2013 +0900
genlist_example_0x.c: clean up sample codes.
1. use elm_win_util_standard_add in normal case. don't need to create the
bg manually.
2. size hint align is not needed for window resize object.
---
src/examples/genlist_example_01.c | 11 ++---------
src/examples/genlist_example_02.c | 12 ++----------
src/examples/genlist_example_03.c | 12 ++----------
src/examples/genlist_example_04.c | 12 ++----------
src/examples/genlist_example_05.c | 12 ++----------
5 files changed, 10 insertions(+), 49 deletions(-)
diff --git a/src/examples/genlist_example_01.c
b/src/examples/genlist_example_01.c
index cc20c09..f7c7938 100644
--- a/src/examples/genlist_example_01.c
+++ b/src/examples/genlist_example_01.c
@@ -37,21 +37,14 @@ _item_sel_cb(void *data, Evas_Object *obj, void *event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg;
+ Evas_Object *win;
Evas_Object *list;
int i;
- win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
- elm_win_title_set(win, "Icon");
+ win = elm_win_util_standard_add("genlist", "Genlist");
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_bg_color_set(bg, 255,255 ,255);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
if (!_itc)
{
_itc = elm_genlist_item_class_new();
diff --git a/src/examples/genlist_example_02.c
b/src/examples/genlist_example_02.c
index 501c121..9d73aa4 100644
--- a/src/examples/genlist_example_02.c
+++ b/src/examples/genlist_example_02.c
@@ -86,24 +86,16 @@ _realize_cb(void *data, Evas_Object *o, void *event_info)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *box, *hbox;
+ Evas_Object *win, *box, *hbox;
Evas_Object *list, *btn;
int i;
- win = elm_win_add(NULL, "genlist", ELM_WIN_BASIC);
- elm_win_title_set(win, "Genlist - simple");
+ win = elm_win_util_standard_add("genlist", "Genlist - simple");
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_bg_color_set(bg, 255,255 ,255);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_win_resize_object_add(win, box);
evas_object_show(box);
diff --git a/src/examples/genlist_example_03.c
b/src/examples/genlist_example_03.c
index d6875d7..02a7bd8 100644
--- a/src/examples/genlist_example_03.c
+++ b/src/examples/genlist_example_03.c
@@ -74,24 +74,16 @@ _genlist_fill(Evas_Object *list)
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *box;
+ Evas_Object *win, *box;
Evas_Object *list;
- win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
- elm_win_title_set(win, "Icon");
+ win = elm_win_util_standard_add("genlist", "Genlist");
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_bg_color_set(bg, 255,255 ,255);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
box = elm_box_add(win);
elm_box_horizontal_set(box, EINA_TRUE);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_win_resize_object_add(win, box);
evas_object_show(box);
diff --git a/src/examples/genlist_example_04.c
b/src/examples/genlist_example_04.c
index dfeedfb..090c9d0 100644
--- a/src/examples/genlist_example_04.c
+++ b/src/examples/genlist_example_04.c
@@ -234,27 +234,19 @@ _button_add(Evas_Object *list, Evas_Object *box, const
char *label, Evas_Smart_C
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *box, *fbox;
+ Evas_Object *win, *box, *fbox;
Evas_Object *list;
Evas_Object *bt_bring_in, *bt_show;
Evas_Object *bt_middle_in, *bt_middle_show;
Evas_Object *bt_top_in, *bt_top_show;
int i;
- win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
- elm_win_title_set(win, "Icon");
+ win = elm_win_util_standard_add("genlist", "Genlist");
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_bg_color_set(bg, 255,255 ,255);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_win_resize_object_add(win, box);
evas_object_show(box);
diff --git a/src/examples/genlist_example_05.c
b/src/examples/genlist_example_05.c
index 0b181ee..7f1b095 100644
--- a/src/examples/genlist_example_05.c
+++ b/src/examples/genlist_example_05.c
@@ -305,24 +305,16 @@ _button_add(Evas_Object *list, Evas_Object *box, const
char *label, Evas_Smart_C
EAPI_MAIN int
elm_main(int argc, char **argv)
{
- Evas_Object *win, *bg, *box, *fbox;
+ Evas_Object *win, *box, *fbox;
Evas_Object *list;
int i;
- win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
- elm_win_title_set(win, "Icon");
+ win = elm_win_util_standard_add("genlist", "Genlist");
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
elm_win_autodel_set(win, EINA_TRUE);
- bg = elm_bg_add(win);
- elm_bg_color_set(bg, 255,255 ,255);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_win_resize_object_add(win, box);
evas_object_show(box);
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
