expedite: fix to follow the new eo_add semantics.
Summary: Please see EFL's commit a7560dbc61953c3652780f232e38adbd2d711972 for more information. @fix Reviewers: cedric, tasn Subscribers: felipealmeida Differential Revision: https://phab.enlightenment.org/D1494 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
parent
578c0b4318
commit
776268d077
10
src/bin/ui.c
10
src/bin/ui.c
|
@ -361,7 +361,6 @@ _ui_menu_item_full_add(Eina_Bool test,
|
||||||
|
|
||||||
mi = malloc(sizeof(Menu_Item));
|
mi = malloc(sizeof(Menu_Item));
|
||||||
mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas);
|
mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas);
|
||||||
eo_unref(mi->o_icon);
|
|
||||||
eo_do(mi->o_icon, efl_file_set(build_path(icon), NULL),
|
eo_do(mi->o_icon, efl_file_set(build_path(icon), NULL),
|
||||||
evas_obj_size_set(32, 32),
|
evas_obj_size_set(32, 32),
|
||||||
evas_obj_image_fill_set(0, 0, 32, 32));
|
evas_obj_image_fill_set(0, 0, 32, 32));
|
||||||
|
@ -391,7 +390,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
|
||||||
win_h = ui_h;
|
win_h = ui_h;
|
||||||
|
|
||||||
o = eo_add(EVAS_RECTANGLE_CLASS, evas);
|
o = eo_add(EVAS_RECTANGLE_CLASS, evas);
|
||||||
eo_unref(o);
|
|
||||||
eo_do(o, evas_obj_position_set(0, 0),
|
eo_do(o, evas_obj_position_set(0, 0),
|
||||||
evas_obj_size_set(win_w, win_h),
|
evas_obj_size_set(win_w, win_h),
|
||||||
evas_obj_color_set(0, 0, 0, 0),
|
evas_obj_color_set(0, 0, 0, 0),
|
||||||
|
@ -402,7 +400,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
|
||||||
o_bg = o;
|
o_bg = o;
|
||||||
|
|
||||||
o = eo_add(EVAS_RECTANGLE_CLASS, evas);
|
o = eo_add(EVAS_RECTANGLE_CLASS, evas);
|
||||||
eo_unref(o);
|
|
||||||
eo_do(o, evas_obj_position_set(0, 0),
|
eo_do(o, evas_obj_position_set(0, 0),
|
||||||
evas_obj_size_set(win_w, win_h),
|
evas_obj_size_set(win_w, win_h),
|
||||||
evas_obj_color_set(255, 255, 255, 255),
|
evas_obj_color_set(255, 255, 255, 255),
|
||||||
|
@ -411,7 +408,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
|
||||||
o_wallpaper = o;
|
o_wallpaper = o;
|
||||||
|
|
||||||
o = eo_add(EVAS_TEXT_CLASS, evas);
|
o = eo_add(EVAS_TEXT_CLASS, evas);
|
||||||
eo_unref(o);
|
|
||||||
eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
|
eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
|
||||||
efl_text_set("EXPEDITE"),
|
efl_text_set("EXPEDITE"),
|
||||||
evas_obj_layer_set(100),
|
evas_obj_layer_set(100),
|
||||||
|
@ -425,7 +421,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
|
||||||
o_title = o;
|
o_title = o;
|
||||||
|
|
||||||
o = eo_add(EVAS_TEXT_CLASS, evas);
|
o = eo_add(EVAS_TEXT_CLASS, evas);
|
||||||
eo_unref(o);
|
|
||||||
eo_do(o, efl_text_properties_font_set("Vera", 9),
|
eo_do(o, efl_text_properties_font_set("Vera", 9),
|
||||||
efl_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."),
|
efl_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."),
|
||||||
evas_obj_layer_set(100),
|
evas_obj_layer_set(100),
|
||||||
|
@ -439,7 +434,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
|
||||||
o_byline = o;
|
o_byline = o;
|
||||||
|
|
||||||
o = eo_add(EVAS_IMAGE_CLASS, evas);
|
o = eo_add(EVAS_IMAGE_CLASS, evas);
|
||||||
eo_unref(o);
|
|
||||||
eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)),
|
eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)),
|
||||||
efl_file_set(build_path("e-logo.png"), NULL),
|
efl_file_set(build_path("e-logo.png"), NULL),
|
||||||
evas_obj_image_fill_set(0, 0, 120, 160),
|
evas_obj_image_fill_set(0, 0, 120, 160),
|
||||||
|
@ -450,7 +444,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
|
||||||
o_menu_logo = o;
|
o_menu_logo = o;
|
||||||
|
|
||||||
o = eo_add(EVAS_IMAGE_CLASS, evas);
|
o = eo_add(EVAS_IMAGE_CLASS, evas);
|
||||||
eo_unref(o);
|
|
||||||
eo_do(o, evas_obj_position_set(win_w - 128, - 128),
|
eo_do(o, evas_obj_position_set(win_w - 128, - 128),
|
||||||
evas_obj_image_fill_set(0, 0, 256, 256),
|
evas_obj_image_fill_set(0, 0, 256, 256),
|
||||||
evas_obj_size_set(256, 256),
|
evas_obj_size_set(256, 256),
|
||||||
|
@ -458,7 +451,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
|
||||||
o_menu_icon = o;
|
o_menu_icon = o;
|
||||||
|
|
||||||
o = eo_add(EVAS_IMAGE_CLASS, evas);
|
o = eo_add(EVAS_IMAGE_CLASS, evas);
|
||||||
eo_unref(o);
|
|
||||||
eo_do(o, evas_obj_position_set(0, 0),
|
eo_do(o, evas_obj_position_set(0, 0),
|
||||||
efl_file_set(build_path("icon_sel.png"), NULL),
|
efl_file_set(build_path("icon_sel.png"), NULL),
|
||||||
evas_obj_size_set(48, 48),
|
evas_obj_size_set(48, 48),
|
||||||
|
@ -466,7 +458,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
|
||||||
o_menu_icon_sel = o;
|
o_menu_icon_sel = o;
|
||||||
|
|
||||||
o = eo_add(EVAS_IMAGE_CLASS, evas);
|
o = eo_add(EVAS_IMAGE_CLASS, evas);
|
||||||
eo_unref(o);
|
|
||||||
eo_do(o, evas_obj_position_set(0, 0),
|
eo_do(o, evas_obj_position_set(0, 0),
|
||||||
efl_file_set(build_path("text_sel.png"), NULL),
|
efl_file_set(build_path("text_sel.png"), NULL),
|
||||||
evas_obj_size_set(96, 32),
|
evas_obj_size_set(96, 32),
|
||||||
|
@ -475,7 +466,6 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
|
||||||
o_menu_text_sel = o;
|
o_menu_text_sel = o;
|
||||||
|
|
||||||
o = eo_add(EVAS_TEXT_CLASS, evas);
|
o = eo_add(EVAS_TEXT_CLASS, evas);
|
||||||
eo_unref(o);
|
|
||||||
eo_do(o, efl_text_properties_font_set("Vera", 10),
|
eo_do(o, efl_text_properties_font_set("Vera", 10),
|
||||||
efl_text_set(""),
|
efl_text_set(""),
|
||||||
evas_obj_color_set(0, 0, 0, 100),
|
evas_obj_color_set(0, 0, 0, 100),
|
||||||
|
|
Loading…
Reference in New Issue