elm: Applied icon/image API changes.

Signed-off-by: Daniel Juyung Seo <juyung.seo@samsung.com>

SVN revision: 68728
This commit is contained in:
Daniel Juyung Seo 2012-03-05 15:10:59 +00:00 committed by Daniel Juyung Seo
parent 8977312e43
commit 9c3fa866f5
32 changed files with 95 additions and 95 deletions

View File

@ -3486,7 +3486,7 @@
* elm_image_no_scale_set() is used just to set this value to true (we
* don't want to scale our image anyway, just resize it).
*
* elm_image_scale_set() is used to allow the image to be resized to a size
* elm_image_resizable_set() is used to allow the image to be resized to a size
* smaller than the original one, but not to a size bigger than it.
*
* elm_elm_image_smooth_set() will disable the smooth scaling, so the scale
@ -3555,7 +3555,7 @@
* elm_icon_no_scale_set() is used just to set this value to true (we
* don't want to scale our icon anyway, just resize it).
*
* elm_icon_scale_set() is used to allow the icon to be resized to a size
* elm_icon_resizable_set() is used to allow the icon to be resized to a size
* smaller than the original one, but not to a size bigger than it.
*
* elm_elm_icon_smooth_set() will disable the smooth scaling, so the scale

View File

@ -8,17 +8,17 @@ Evas_Object *ctxpopup = elm_ctxpopup_add(o);
Evas_Object *ic = elm_icon_add(ctxpopup);
elm_icon_standard_set(ic, "home");
elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE);
elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
elm_ctxpopup_item_append(ctxpopup, "Go to home folder", ic, NULL, NULL);
ic = elm_icon_add(ctxpopup);
elm_icon_standard_set(ic, "delete");
elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE);
elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
elm_ctxpopup_item_append(ctxpopup, "Delete file", ic, NULL, NULL);
ic = elm_icon_add(ctxpopup);
elm_icon_standard_set(ic, "folder");
elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE);
elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
Elm_Object_Item *it = elm_ctxpopup_item_append(ctxpopup, "Navigate to folder", ic, NULL, NULL);
elm_object_item_disabled_set(it, EINA_TRUE);

View File

@ -5,7 +5,7 @@ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, o);
elm_icon_standard_set(o, "home");
elm_icon_scale_set(o, EINA_FALSE, EINA_FALSE);
elm_icon_resizable_set(o, EINA_FALSE, EINA_FALSE);
evas_object_show(o);
#include "widget_preview_tmpl_foot.c"

View File

@ -5,7 +5,7 @@ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, o);
elm_image_file_set(o, PACKAGE_DATA_DIR"/images/logo_small.png", NULL);
elm_image_scale_set(o, EINA_FALSE, EINA_FALSE);
elm_image_resizable_set(o, EINA_FALSE, EINA_FALSE);
evas_object_show(o);
#include "widget_preview_tmpl_foot.c"

View File

@ -17,7 +17,7 @@ for (i = 0; i < 8; i++)
{
Evas_Object *ic = elm_icon_add(win);
elm_icon_standard_set(ic, "home");
elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE);
elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
evas_object_show(ic);
elm_table_pack(tb, ic, i, j, 1, 1);
}

View File

@ -143,7 +143,7 @@ test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
bb = elm_bubble_add(win);
@ -207,7 +207,7 @@ test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
bb = elm_bubble_add(win);

View File

@ -165,7 +165,7 @@ test_box_vert(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/icon_01.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, 0.5, 0.5);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
@ -173,7 +173,7 @@ test_box_vert(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/icon_02.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, 0.0, 0.5);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
@ -181,7 +181,7 @@ test_box_vert(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/icon_03.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, EVAS_HINT_EXPAND, 0.5);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
@ -300,7 +300,7 @@ test_box_horiz(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/icon_01.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, 0.5, 0.5);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
@ -308,7 +308,7 @@ test_box_horiz(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/icon_02.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, 0.5, 0.0);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
@ -316,7 +316,7 @@ test_box_horiz(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/icon_03.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, 0.0, EVAS_HINT_EXPAND);
elm_box_pack_end(bx, ic);
evas_object_show(ic);

View File

@ -62,7 +62,7 @@ set_api_state(api_data *api)
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_object_content_set(eina_list_nth(items, 0), ic);
ct = elm_label_add(api->win);
elm_object_text_set(ct, "Using icon as top-bubble content");
@ -142,7 +142,7 @@ test_bubble(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
bb = elm_bubble_add(win);

View File

@ -74,7 +74,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
ic = elm_icon_add(bx);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
bt = elm_button_add(win);
elm_object_text_set(bt, "Icon no scale");
elm_object_part_content_set(bt, "icon", ic);
@ -125,7 +125,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
bt = elm_button_add(win);
elm_object_part_content_set(bt, "icon", ic);
evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)6);

View File

@ -60,7 +60,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
ck = elm_check_add(win);
elm_object_text_set(ck, "Icon no scale");
elm_object_part_content_set(ck, "icon", ic);
@ -105,7 +105,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
ck = elm_check_add(win);
elm_object_part_content_set(ck, "icon", ic);
elm_box_pack_end(bx, ck);

View File

@ -81,7 +81,7 @@ _ctxpopup_item_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
{ \
ic = elm_icon_add(obj); \
elm_icon_standard_set(ic, _icon); \
elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE); \
elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE); \
} \
else \
ic = NULL; \

View File

@ -279,7 +279,7 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 1, 1);
elm_icon_resizable_set(ic, 1, 1);
elm_diskselector_item_append(disk, "Sunday", ic, NULL, NULL);
elm_diskselector_item_append(disk, "Monday", NULL, NULL, NULL);
elm_diskselector_item_append(disk, "Tuesday", NULL, NULL, NULL);
@ -298,7 +298,7 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 1, 1);
elm_icon_resizable_set(ic, 1, 1);
elm_diskselector_item_append(disk, "머리스타일", ic, NULL, NULL);
elm_diskselector_item_append(disk, "プロが伝授する", NULL, NULL, NULL);
elm_diskselector_item_append(disk, "生上访要求政府", NULL, NULL, NULL);

View File

@ -943,12 +943,12 @@ Evas_Object *gl5_content_get(void *data, Evas_Object *obj, const char *part)
ic = elm_icon_add(obj);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_show(ic);
elm_box_pack_end(bx, ic);
ic = elm_icon_add(obj);
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_show(ic);
elm_box_pack_end(bx, ic);
elm_box_horizontal_set(bx, EINA_TRUE);

View File

@ -502,7 +502,7 @@ Evas_Object *create_gesture_box(Evas_Object *win, icon_properties *icons,
snprintf(buf, sizeof(buf), "%s/images/g_layer/%s_1.png",
elm_app_data_dir_get(), icons[idx].name);
elm_icon_file_set(icons[idx].icon, buf, NULL);
elm_icon_scale_set(icons[idx].icon, 0, 0);
elm_icon_resizable_set(icons[idx].icon, 0, 0);
evas_object_size_hint_align_set(icons[idx].icon, 0.5, 0.5);
_icon_color_set(&icons[idx], INI_R, INI_G, INI_B, INI_A);
elm_box_pack_end(bx, icons[idx].icon);

View File

@ -57,7 +57,7 @@ test_hover(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
@ -140,7 +140,7 @@ test_hover2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
bt = elm_button_add(win);

View File

@ -23,7 +23,7 @@ test_icon(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_icon_no_scale_set(ic, 1);
evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_fill_set(ic, 0.5, 0.5);

View File

@ -35,7 +35,7 @@ test_icon_animated(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
elm_icon_animated_set(ic, EINA_TRUE);
elm_icon_animated_play_set(ic, EINA_TRUE);
}
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_icon_no_scale_set(ic, 1);
evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_fill_set(ic, 0.5, 0.5);

View File

@ -265,7 +265,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
elm_object_scale_set(ic, 0.5);
snprintf(buf, sizeof(buf), "%s/images/icon_%02i.png", elm_app_data_dir_get(), n);
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ic, 0.5, 0.5);
elm_table_pack(tb, ic, 1 + i, 1 + (j * 2), 1, 1);
@ -809,7 +809,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
elm_object_scale_set(ic, 0.5);
snprintf(buf, sizeof(buf), "%s/images/icon_%02i.png", elm_app_data_dir_get(), n);
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ic, 0.5, 0.5);
elm_object_part_content_set(ly2, "slot", ic);

View File

@ -324,24 +324,24 @@ test_list(void *data __UNUSED__,
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 1, 1);
elm_icon_resizable_set(ic, 1, 1);
list_it1 = elm_list_item_append(li, "Hello", ic, NULL, NULL, NULL);
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_icon_file_set(ic, buf, NULL);
elm_list_item_append(li, "world", ic, NULL, NULL, NULL);
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "edit");
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_list_item_append(li, ".", ic, NULL, NULL, NULL);
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "delete");
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
ic2 = elm_icon_add(win);
elm_icon_standard_set(ic2, "clock");
elm_icon_scale_set(ic2, 0, 0);
elm_icon_resizable_set(ic2, 0, 0);
list_it2 = elm_list_item_append(li, "How", ic, ic2, NULL, NULL);
bx = elm_box_add(win);
@ -350,7 +350,7 @@ test_list(void *data __UNUSED__,
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, 0.5, 0.5);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
@ -358,7 +358,7 @@ test_list(void *data __UNUSED__,
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, 0.5, 0.0);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
@ -366,7 +366,7 @@ test_list(void *data __UNUSED__,
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, 0.0, EVAS_HINT_EXPAND);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
@ -472,24 +472,24 @@ test_list_horizontal(void *data __UNUSED__,
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 1, 1);
elm_icon_resizable_set(ic, 1, 1);
list_it1 = elm_list_item_append(li, "Hello", ic, NULL, NULL, NULL);
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_icon_file_set(ic, buf, NULL);
elm_list_item_append(li, "world", ic, NULL, NULL, NULL);
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "edit");
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_list_item_append(li, ".", ic, NULL, NULL, NULL);
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "delete");
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
ic2 = elm_icon_add(win);
elm_icon_standard_set(ic2, "clock");
elm_icon_scale_set(ic2, 0, 0);
elm_icon_resizable_set(ic2, 0, 0);
list_it2 = elm_list_item_append(li, "How", ic, ic2, NULL, NULL);
bx = elm_box_add(win);
@ -497,7 +497,7 @@ test_list_horizontal(void *data __UNUSED__,
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, 0.5, 0.5);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
@ -505,7 +505,7 @@ test_list_horizontal(void *data __UNUSED__,
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, 0.5, 0.0);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
@ -630,20 +630,20 @@ test_list2(void *data __UNUSED__,
elm_list_item_selected_set(list_it, EINA_TRUE);
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_icon_file_set(ic, buf, NULL);
elm_list_item_append(li, "world", ic, NULL, NULL, NULL);
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "edit");
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_list_item_append(li, ".", ic, NULL, NULL, NULL);
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "delete");
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
ic2 = elm_icon_add(win);
elm_icon_standard_set(ic2, "clock");
elm_icon_scale_set(ic2, 0, 0);
elm_icon_resizable_set(ic2, 0, 0);
elm_list_item_append(li, "How", ic, ic2, NULL, NULL);
bx2 = elm_box_add(win);
@ -652,7 +652,7 @@ test_list2(void *data __UNUSED__,
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, 0.5, 0.5);
elm_box_pack_end(bx2, ic);
evas_object_show(ic);
@ -660,7 +660,7 @@ test_list2(void *data __UNUSED__,
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, 0.5, 0.0);
elm_box_pack_end(bx2, ic);
evas_object_show(ic);
@ -747,7 +747,7 @@ test_list3(void *data __UNUSED__,
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_icon_file_set(ic, buf, NULL);
ic2 = elm_button_add(win);
elm_object_text_set(ic2, "Click me");
@ -757,7 +757,7 @@ test_list3(void *data __UNUSED__,
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_icon_file_set(ic, buf, NULL);
ic2 = elm_button_add(win);
elm_object_text_set(ic2, "Click me");
@ -766,15 +766,15 @@ test_list3(void *data __UNUSED__,
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "edit");
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_list_item_append(li, ".", ic, NULL, NULL, NULL);
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "delete");
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
ic2 = elm_icon_add(win);
elm_icon_standard_set(ic2, "clock");
elm_icon_scale_set(ic2, 0, 0);
elm_icon_resizable_set(ic2, 0, 0);
elm_list_item_append(li, "How", ic, ic2, NULL, NULL);
bx = elm_box_add(win);
@ -783,7 +783,7 @@ test_list3(void *data __UNUSED__,
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, 0.5, 0.5);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
@ -791,7 +791,7 @@ test_list3(void *data __UNUSED__,
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, 0.5, 0.0);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
@ -799,7 +799,7 @@ test_list3(void *data __UNUSED__,
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_align_set(ic, 0.0, EVAS_HINT_EXPAND);
elm_box_pack_end(bx, ic);
evas_object_show(ic);
@ -929,7 +929,7 @@ test_list4(void *data __UNUSED__,
"conceptalbums The Dark Side of the Moon, Wish You Were Here, Animals, and The Wall.";
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/mystrale.jpg", elm_app_data_dir_get());
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_icon_file_set(ic, buf, NULL);
elm_list_item_append(li, "Pink Floyd", ic, NULL, NULL, &pf_data);
@ -946,7 +946,7 @@ test_list4(void *data __UNUSED__,
"their first album going multi-platinum globally.";
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/mystrale_2.jpg", elm_app_data_dir_get());
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_icon_file_set(ic, buf, NULL);
elm_list_item_append(li, "Dire Straits", ic, NULL, NULL, &ds_data);
@ -958,7 +958,7 @@ test_list4(void *data __UNUSED__,
"perform at stadium-sized venues.";
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/icon_17.png", elm_app_data_dir_get());
elm_icon_scale_set(ic, 1, 1);
elm_icon_resizable_set(ic, 1, 1);
elm_icon_file_set(ic, buf, NULL);
elm_list_item_append(li, "Uriah Heep", ic, NULL, NULL, &uh_data);
@ -970,11 +970,11 @@ test_list4(void *data __UNUSED__,
"two weeks before the group's first United States tour.";
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/icon_21.png", elm_app_data_dir_get());
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
elm_icon_file_set(ic, buf, NULL);
ic2 = elm_icon_add(win);
elm_icon_standard_set(ic2, "clock");
elm_icon_scale_set(ic2, 0, 0);
elm_icon_resizable_set(ic2, 0, 0);
elm_list_item_append(li, "Rush", ic, ic2, NULL, &r_data);
elm_list_go(li);

View File

@ -42,7 +42,7 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
rd = elm_radio_add(win);
elm_radio_state_value_set(rd, 1);
@ -71,7 +71,7 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
rd = elm_radio_add(win);
elm_radio_state_value_set(rd, 4);
@ -84,7 +84,7 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
rd = elm_radio_add(win);
elm_radio_state_value_set(rd, 5);

View File

@ -44,7 +44,7 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
tg = elm_check_add(win);
elm_object_style_set(tg, "toggle");
@ -57,7 +57,7 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
tg = elm_check_add(win);
elm_object_style_set(tg, "toggle");
@ -79,7 +79,7 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
tg = elm_check_add(win);
elm_object_style_set(tg, "toggle");

View File

@ -117,7 +117,7 @@ _tt_item_icon(void *data __UNUSED__,
snprintf(buf, sizeof(buf), "%s/images/logo_small.png",
elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_resize(ic, 64, 64);
return ic;
}
@ -132,7 +132,7 @@ _tt_item_icon2(void *data __UNUSED__,
char buf[PATH_MAX];
snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
return ic;
}
@ -248,7 +248,7 @@ _tt_icon(void *data __UNUSED__,
snprintf(buf, sizeof(buf), "%s/images/logo_small.png",
elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_resize(ic, 64, 64);
return ic;
}
@ -262,7 +262,7 @@ _tt_icon2(void *data __UNUSED__,
char buf[PATH_MAX];
snprintf(buf, sizeof(buf), "%s/images/icon_00.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_resize(ic, 64, 64);
return ic;
}

View File

@ -49,7 +49,7 @@ fill(Evas_Object *win, Eina_Bool do_bg)
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
bb = elm_bubble_add(win);
@ -108,7 +108,7 @@ fill(Evas_Object *win, Eina_Bool do_bg)
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
bb = elm_bubble_add(win);

View File

@ -56,7 +56,7 @@ fill(Evas_Object *win, Eina_Bool do_bg)
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
bb = elm_bubble_add(win);
@ -115,7 +115,7 @@ fill(Evas_Object *win, Eina_Bool do_bg)
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
elm_icon_resizable_set(ic, 0, 0);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
bb = elm_bubble_add(win);

View File

@ -52,7 +52,7 @@ external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
}
if (p->scale_up_exists && p->scale_down_exists)
{
elm_icon_scale_set(obj, p->scale_up, p->scale_down);
elm_icon_resizable_set(obj, p->scale_up, p->scale_down);
param_icon->scale_up = p->scale_up;
param_icon->scale_down = p->scale_down;
}
@ -60,12 +60,12 @@ external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
{
if (p->scale_up_exists)
{
elm_icon_scale_set(obj, p->scale_up, param_icon->scale_down);
elm_icon_resizable_set(obj, p->scale_up, param_icon->scale_down);
param_icon->scale_up = p->scale_up;
}
else
{
elm_icon_scale_set(obj, param_icon->scale_up, p->scale_down);
elm_icon_resizable_set(obj, param_icon->scale_up, p->scale_down);
param_icon->scale_down = p->scale_down;
}
}
@ -121,14 +121,14 @@ external_icon_param_set(void *data __UNUSED__, Evas_Object *obj,
else if (!strcmp(param->name, "scale up")
&& param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_icon_scale_set(obj, param->i, param_icon->scale_down);
elm_icon_resizable_set(obj, param->i, param_icon->scale_down);
param_icon->scale_up = param->i;
return EINA_TRUE;
}
else if (!strcmp(param->name, "scale down")
&& param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_icon_scale_set(obj, param_icon->scale_up, param->i);
elm_icon_resizable_set(obj, param_icon->scale_up, param->i);
param_icon->scale_down = param->i;
return EINA_TRUE;
}

View File

@ -16,7 +16,7 @@ Elm_Object_Item *item_new(Evas_Object *ctxpopup, const char * label, const char
{
Evas_Object *ic = elm_icon_add(ctxpopup);
elm_icon_standard_set(ic, icon);
elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE);
elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
return elm_ctxpopup_item_append(ctxpopup, label, ic, _ctxpopup_item_cb, NULL);
}

View File

@ -38,7 +38,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
printf("path = %s, group = %s, name = %s\n", path, group, name);
elm_icon_no_scale_set(icon, EINA_TRUE);
elm_icon_scale_set(icon, EINA_FALSE, EINA_TRUE);
elm_icon_resizable_set(icon, EINA_FALSE, EINA_TRUE);
elm_icon_smooth_set(icon, EINA_FALSE);
elm_icon_fill_outside_set(icon, EINA_TRUE);

View File

@ -36,7 +36,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
}
elm_image_no_scale_set(image, EINA_TRUE);
elm_image_scale_set(image, EINA_FALSE, EINA_TRUE);
elm_image_resizable_set(image, EINA_FALSE, EINA_TRUE);
elm_image_smooth_set(image, EINA_FALSE);
elm_image_orient_set(image, ELM_IMAGE_FLIP_HORIZONTAL);
elm_image_aspect_fixed_set(image, EINA_TRUE);

View File

@ -62,7 +62,7 @@ _add_ic_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
snprintf(label, sizeof(label), "Item %i", counter++);
ic = elm_icon_add(li);
elm_icon_standard_set(ic, "home");
elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE);
elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
list_it = elm_list_item_append(li, label, ic, NULL, NULL, NULL);
if (!list_it)

View File

@ -81,7 +81,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
{
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "home");
elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE);
elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
evas_object_show(ic);
elm_table_pack(tb, ic, i, j, 1, 1);
}

View File

@ -84,12 +84,12 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "home");
elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE);
elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
elm_object_part_content_set(sl, "icon", ic);
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "folder");
elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE);
elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
elm_object_part_content_set(sl, "end", ic);
evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);

View File

@ -211,7 +211,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
o = elm_icon_add(win2);
elm_icon_file_set(o, PACKAGE_DATA_DIR "/images/logo.png", NULL);
elm_icon_scale_set(o, 0, 0);
elm_icon_resizable_set(o, 0, 0);
elm_icon_no_scale_set(o, EINA_TRUE);
elm_win_resize_object_add(win2, o);
evas_object_show(o);