projects
/
apps
/
native
/
sample
/
adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Search : scroller & item
[apps/native/sample/adventure.git]
/
src
/
item.c
diff --git
a/src/item.c
b/src/item.c
index
9e139cc
..
25d04d2
100644
(file)
--- a/
src/item.c
+++ b/
src/item.c
@@
-91,7
+91,7
@@
Evas_Object *item_create_typing(Evas_Object *parent, int city)
item = elm_layout_add(parent);
retv_if(!item, NULL);
item = elm_layout_add(parent);
retv_if(!item, NULL);
- elm_layout_file_set(item,
ITEM_EDJE
, "item_typing");
+ elm_layout_file_set(item,
full_path
, "item_typing");
evas_object_size_hint_weight_set(item, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(item, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(item, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(item, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@
-104,7
+104,7
@@
Evas_Object *item_create_typing(Evas_Object *parent, int city)
return NULL;
}
return NULL;
}
- snprintf(city_str, sizeof(city_str), "%s
", city_info[city].name
);
+ snprintf(city_str, sizeof(city_str), "%s
, %s", city_info[city].name, city_info[city].nation
);
elm_object_part_text_set(item, "city", city_str);
elm_object_signal_callback_add(item, "down", "item", _item_down_cb, NULL);
elm_object_part_text_set(item, "city", city_str);
elm_object_signal_callback_add(item, "down", "item", _item_down_cb, NULL);
@@
-158,7
+158,7
@@
Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color)
item = elm_layout_add(parent);
retv_if(!item, NULL);
item = elm_layout_add(parent);
retv_if(!item, NULL);
- elm_layout_file_set(item,
ITEM_EDJE
, "item_selecting");
+ elm_layout_file_set(item,
full_path
, "item_selecting");
evas_object_size_hint_weight_set(item, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(item, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(item, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(item, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@
-273,7
+273,7
@@
Evas_Object *item_create_result(Evas_Object *parent, int city, int color, int st
item = elm_layout_add(parent);
goto_if(!item, error);
item = elm_layout_add(parent);
goto_if(!item, error);
- elm_layout_file_set(item,
ITEM_EDJE
, "item_result");
+ elm_layout_file_set(item,
full_path
, "item_result");
evas_object_size_hint_weight_set(item, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(item, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(item, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(item, EVAS_HINT_FILL, EVAS_HINT_FILL);