diff options
author | Tom Hacohen <tom@stosb.com> | 2016-03-03 14:03:49 +0000 |
---|---|---|
committer | Tom Hacohen <tom@stosb.com> | 2016-03-03 14:03:49 +0000 |
commit | 088df1425e5ee03f3f26ce209b2040985e8231c5 (patch) | |
tree | 8392f28ad2068908d4edeef73c23642c97f91813 /src/bin/widgets_file_icons_2_same.c | |
parent | 1c72554acc7b7390e65b487d2a428b6faea068b8 (diff) |
Adjust according to recent Eo4 changes.
Diffstat (limited to 'src/bin/widgets_file_icons_2_same.c')
-rw-r--r-- | src/bin/widgets_file_icons_2_same.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c index 26fb8ad..113cc5b 100644 --- a/src/bin/widgets_file_icons_2_same.c +++ b/src/bin/widgets_file_icons_2_same.c | |||
@@ -33,17 +33,17 @@ static void _setup(void) | |||
33 | { | 33 | { |
34 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 34 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
35 | o_images[i] = o; | 35 | o_images[i] = o; |
36 | eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL), | 36 | efl_file_set(o, build_path(icons[i % 1]), NULL); |
37 | efl_gfx_fill_set(0, 0, ICON_SIZE, ICON_SIZE), | 37 | efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); |
38 | efl_gfx_size_set(ICON_SIZE, ICON_SIZE), | 38 | efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); |
39 | efl_gfx_visible_set(EINA_TRUE)); | 39 | efl_gfx_visible_set(o, EINA_TRUE); |
40 | 40 | ||
41 | o = eo_add(EVAS_TEXT_CLASS, evas); | 41 | o = eo_add(EVAS_TEXT_CLASS, evas); |
42 | o_texts[i] = o; | 42 | o_texts[i] = o; |
43 | eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), | 43 | efl_text_properties_font_set(o, "Vera-Bold", 10); |
44 | efl_text_set(icons[i % 1]), | 44 | efl_text_set(o, icons[i % 1]); |
45 | efl_gfx_color_set(0, 0, 0, 255), | 45 | efl_gfx_color_set(o, 0, 0, 0, 255); |
46 | efl_gfx_visible_set(EINA_TRUE)); | 46 | efl_gfx_visible_set(o, EINA_TRUE); |
47 | } | 47 | } |
48 | done = 0; | 48 | done = 0; |
49 | } | 49 | } |
@@ -68,10 +68,10 @@ static void _loop(double t, int f) | |||
68 | y = 0 - f; | 68 | y = 0 - f; |
69 | for (i = 0; i < NUM; i++) | 69 | for (i = 0; i < NUM; i++) |
70 | { | 70 | { |
71 | eo_do(o_images[i], efl_gfx_position_set(x + 8, y)); | 71 | efl_gfx_position_set(o_images[i], x + 8, y); |
72 | eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); | 72 | efl_gfx_size_get(o_texts[i], &tw, &th); |
73 | cent = (ICON_SIZE + 16 - tw) / 2; | 73 | cent = (ICON_SIZE + 16 - tw) / 2; |
74 | eo_do(o_texts[i], efl_gfx_position_set(x + cent, y + ICON_SIZE + 4)); | 74 | efl_gfx_position_set(o_texts[i], x + cent, y + ICON_SIZE + 4); |
75 | x += ICON_SIZE + 16; | 75 | x += ICON_SIZE + 16; |
76 | if (x > win_w) | 76 | if (x > win_w) |
77 | { | 77 | { |