timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm_test: Remove calls to visible_set for EO objects

This commit is contained in:
Jean-Philippe Andre 2017-07-06 17:22:41 +09:00
parent fd9cf1d3b6
commit 83a4c3e3e2
20 changed files with 33 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/elementary/test_bg.c
View File

@ -335,8 +335,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
box = efl_add(EFL_UI_BOX_CLASS, win,
efl_gfx_size_hint_weight_set(efl_added, 1, 1),
efl_content_set(win, efl_added),
efl_gfx_visible_set(efl_added, 1));
efl_content_set(win, efl_added));
efl_add(ELM_COLORSELECTOR_CLASS, win,
elm_colorselector_mode_set(efl_added, ELM_COLORSELECTOR_PALETTE),
@ -346,9 +345,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
elm_colorselector_palette_color_add(efl_added, 0, 0, 0, 0),
efl_event_callback_add(efl_added, ELM_COLORSELECTOR_EVENT_COLOR_ITEM_SELECTED, _colorsel_cb, win),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0),
efl_pack(box, efl_added),
efl_gfx_visible_set(efl_added, 1)
);
efl_pack(box, efl_added));
snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get());
efl_add(EFL_UI_IMAGE_CLASS, win,
@ -356,9 +353,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_gfx_size_hint_min_set(efl_added, 64, 64),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _file_cb, win),
efl_pack(box, efl_added),
efl_gfx_visible_set(efl_added, 1)
);
efl_pack(box, efl_added));
snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", elm_app_data_dir_get());
efl_add(EFL_UI_IMAGE_CLASS, win,
@ -366,10 +361,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_gfx_size_hint_min_set(efl_added, 64, 64),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _image_cb, win),
efl_pack(box, efl_added),
efl_gfx_visible_set(efl_added, 1)
);
efl_pack(box, efl_added));
efl_gfx_size_set(win, 300, 200);
efl_gfx_visible_set(win, 1);
}

10
src/bin/elementary/test_box.c
View File

@ -904,8 +904,7 @@ test_box_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win,
efl_gfx_color_set(efl_added, 0, 64, 128, 255),
efl_gfx_size_hint_align_set(efl_added, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL),
efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND),
efl_gfx_visible_set(efl_added, EINA_TRUE));
efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND));
efl_pack(bx, o);
/* rectangle with a max size */
@ -913,8 +912,7 @@ test_box_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_gfx_color_set(efl_added, 64, 128, 64, 255),
efl_gfx_size_hint_align_set(efl_added, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL),
efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND),
efl_gfx_size_hint_max_set(efl_added, 128, 20),
efl_gfx_visible_set(efl_added, EINA_TRUE));
efl_gfx_size_hint_max_set(efl_added, 128, 20));
efl_pack(bx, o);
/* image with a forced min size */
@ -923,13 +921,11 @@ test_box_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_gfx_size_hint_align_set(efl_added, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL),
efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND),
efl_gfx_size_hint_min_set(efl_added, 64, 64),
efl_file_set(efl_added, buf, NULL),
efl_gfx_visible_set(efl_added, EINA_TRUE));
efl_file_set(efl_added, buf, NULL));
efl_pack(bx, o);
/* make window resizable: add a weight to its content */
efl_gfx_size_hint_weight_set(bx, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND);
efl_gfx_size_set(win, 300, 300);
efl_gfx_visible_set(win, EINA_TRUE);
}

5
src/bin/elementary/test_code.c
View File

@ -75,7 +75,6 @@ _elm_code_test_welcome_setup(Evas_Object *parent)
evas_object_size_hint_weight_set(widget, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(widget);
elm_code_widget_selection_start(widget, 1, 3);
elm_code_widget_selection_end(widget, 1, 13);
@ -114,7 +113,6 @@ _elm_code_test_editor_setup(Evas_Object *parent, Eina_Bool log)
evas_object_size_hint_weight_set(widget, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(widget);
return widget;
}
@ -146,7 +144,6 @@ _elm_code_test_syntax_setup(Evas_Object *parent)
evas_object_size_hint_weight_set(widget, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(widget);
return widget;
}
@ -162,7 +159,6 @@ _elm_code_test_mirror_setup(Elm_Code *code, char *font_name, Evas_Object *parent
evas_object_size_hint_weight_set(widget, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(widget);
return widget;
}
@ -178,7 +174,6 @@ _elm_code_test_diff_inline_setup(Evas_Object *parent)
evas_object_size_hint_weight_set(diff, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(diff, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(diff);
elm_code_parser_standard_add(code, ELM_CODE_PARSER_STANDARD_DIFF);
elm_code_file_open(code, PACKAGE_DATA_DIR "/testdiff.diff");

4
src/bin/elementary/test_efl_gfx_map.c
View File

@ -55,8 +55,7 @@ test_efl_gfx_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_gfx_size_hint_align_set(efl_added, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL),
efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND),
efl_gfx_size_hint_min_set(efl_added, 64, 64),
efl_file_set(efl_added, buf, NULL),
efl_gfx_visible_set(efl_added, EINA_TRUE));
efl_file_set(efl_added, buf, NULL));
efl_ui_image_scale_type_set(img, EFL_UI_IMAGE_SCALE_TYPE_FILL);
evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE,
_image_resize_cb, NULL);
@ -65,5 +64,4 @@ test_efl_gfx_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_content_set(win, img);
efl_gfx_size_set(win, W, H);
efl_gfx_visible_set(win, EINA_TRUE);
}

2
src/bin/elementary/test_efl_ui_text.c
View File

@ -33,7 +33,6 @@ _create_label(Eo *win, Eo *bx)
evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(en);
elm_box_pack_end(bx, en);
return en;
}
@ -205,7 +204,6 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(bx, en);
evas_object_show(en);
elm_object_focus_set(en, EINA_TRUE);
bx2 = elm_box_add(win);

4
src/bin/elementary/test_evas_map.c
View File

@ -63,8 +63,7 @@ test_evas_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_gfx_size_hint_align_set(efl_added, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL),
efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND),
efl_gfx_size_hint_min_set(efl_added, 64, 64),
efl_file_set(efl_added, buf, NULL),
efl_gfx_visible_set(efl_added, EINA_TRUE));
efl_file_set(efl_added, buf, NULL));
efl_ui_image_scale_type_set(img, EFL_UI_IMAGE_SCALE_TYPE_FILL);
evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE,
_image_resize_cb, NULL);
@ -73,5 +72,4 @@ test_evas_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_content_set(win, img);
efl_gfx_size_set(win, W, H);
efl_gfx_visible_set(win, EINA_TRUE);
}

16
src/bin/elementary/test_evas_mask.c
View File

@ -126,8 +126,7 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
ly = efl_add(ELM_LAYOUT_CLASS, win,
efl_file_set(efl_added, buf, "masking"),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_gfx_visible_set(efl_added, 1));
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0));
efl_pack(box, ly);
// FIXME: No genlist in EO API
@ -160,28 +159,23 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_orientation_set(efl_added, EFL_ORIENT_RIGHT),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_pack(box, efl_added),
efl_gfx_visible_set(efl_added, 1));
efl_pack(box, efl_added));
// FIXME: button EO API
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Toggle mask"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_mask, ly),
efl_pack(box2, efl_added),
efl_gfx_visible_set(efl_added, 1));
efl_pack(box2, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Toggle map"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, ly),
efl_pack(box2, efl_added),
efl_gfx_visible_set(efl_added, 1));
efl_pack(box2, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Rotate Window"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _rotate_win, win),
efl_pack(box2, efl_added),
efl_gfx_visible_set(efl_added, 1));
efl_pack(box2, efl_added));
efl_gfx_size_set(win, 500, 600);
efl_gfx_visible_set(win, 1);
}

25
src/bin/elementary/test_evas_snapshot.c
View File

@ -32,8 +32,7 @@ _image_create(Eo *win, const char *path)
efl_file_set(efl_added, path, NULL),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0),
efl_gfx_size_hint_min_set(efl_added, 20, 20),
efl_gfx_visible_set(efl_added, 1));
efl_gfx_size_hint_min_set(efl_added, 20, 20));
}
static void
@ -152,8 +151,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_gfx_filter_data_set(efl_added, "radius", "tonumber(5)", EINA_TRUE),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0),
efl_pack_grid(grid, efl_added, 1, 1, GRID_SIZE - 2, GRID_SIZE - 2),
efl_gfx_visible_set(efl_added, 1));
efl_pack_grid(grid, efl_added, 1, 1, GRID_SIZE - 2, GRID_SIZE - 2));
// Objects above snapshot
// 1. Opaque rect, not changing
@ -182,48 +180,41 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack_grid(grid, efl_added, 0, GRID_SIZE, GRID_SIZE, 1),
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _radius_set, win),
efl_gfx_visible_set(efl_added, 1));
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _radius_set, win));
box = efl_add(EFL_UI_BOX_CLASS, win,
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_pack_grid(grid, efl_added, 0, GRID_SIZE + 1, GRID_SIZE, 1),
efl_gfx_visible_set(efl_added, 1));
efl_pack_grid(grid, efl_added, 0, GRID_SIZE + 1, GRID_SIZE, 1));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Toggle animation"),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win),
efl_gfx_visible_set(efl_added, 1));
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Save to file"),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win),
efl_gfx_visible_set(efl_added, 1));
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Map"),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win),
efl_gfx_visible_set(efl_added, 1));
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Close"),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _close_do, win),
efl_gfx_visible_set(efl_added, 1));
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _close_do, win));
efl_key_wref_set(win, "snap", snap);
efl_key_wref_set(win, "grid", grid);
efl_gfx_size_set(win, 400, 400);
efl_gfx_visible_set(win, 1);
}

2
src/bin/elementary/test_events.c
View File

@ -170,7 +170,6 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(bx, -1, -1);
efl_content_set(win, bx);
evas_object_show(bx);
td->win = win;
txt = elm_label_add(win);
@ -200,7 +199,6 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o, -1, -1);
efl_pack(bx, o);
evas_object_show(o);
efl_event_callback_add(td->button, EFL_UI_EVENT_CLICKED, _clicked_button1, td);
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _clicked_button2, td);

34
src/bin/elementary/test_gfx_filters.c
View File

@ -339,22 +339,19 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
box2 = efl_add(EFL_UI_BOX_CLASS, win,
efl_orientation_set(efl_added, EFL_ORIENT_HORIZONTAL),
efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
efl_gfx_size_hint_align_set(efl_added, -1.0, 0.0),
efl_gfx_visible_set(efl_added, 1));
efl_gfx_size_hint_align_set(efl_added, -1.0, 0.0));
efl_pack(box, box2);
/* FIXME: Efl.Ui.Text doesn't work as expected. */
o = efl_add(EFL_UI_TEXT_CLASS, win,
efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0),
efl_gfx_size_hint_align_set(efl_added, 1.0, 0.5),
efl_gfx_visible_set(efl_added, 1));
efl_gfx_size_hint_align_set(efl_added, 1.0, 0.5));
efl_text_set(o, "Filter:");
efl_pack(box2, o);
o = spinner = efl_add(ELM_SPINNER_CLASS, win,
efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0),
efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5),
efl_gfx_visible_set(efl_added, 1));
efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5));
_spinner_fill(o);
efl_pack(box2, o);
spinner = o;
@ -364,16 +361,14 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5),
elm_spinner_min_max_set(efl_added, 6, 120),
elm_spinner_value_set(efl_added, default_font_size),
efl_event_callback_add(efl_added, ELM_SPINNER_EVENT_DELAY_CHANGED, _font_size_change, win),
efl_gfx_visible_set(efl_added, 1));
efl_event_callback_add(efl_added, ELM_SPINNER_EVENT_DELAY_CHANGED, _font_size_change, win));
efl_pack(box2, o);
o = efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Flip"),
efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0),
efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _flip_click, win),
efl_gfx_visible_set(efl_added, 1));
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _flip_click, win));
efl_pack(box2, o);
}
@ -400,8 +395,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_size_hint_min_set(efl_added, ELM_SCALE_SIZE(48), ELM_SCALE_SIZE(48)),
efl_file_set(efl_added, buf, NULL),
efl_name_set(efl_added, images[k].src_name),
elm_object_tooltip_text_set(efl_added, images[k].src_name),
efl_gfx_visible_set(efl_added, 1));
elm_object_tooltip_text_set(efl_added, images[k].src_name));
if (efl_player_playable_get(o))
efl_player_play_set(o, 1);
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _img_click, win);
@ -430,36 +424,30 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_size_hint_max_set(efl_added, -1, ELM_SCALE_SIZE(48 * 2)),
efl_name_set(efl_added, "myColor"),
elm_object_tooltip_text_set(efl_added, "Pick a color to use as variable 'myColor'"),
efl_event_callback_add(efl_added, ELM_COLORSELECTOR_EVENT_CHANGED, _colsel_cb, win),
efl_gfx_visible_set(efl_added, 1));
efl_event_callback_add(efl_added, ELM_COLORSELECTOR_EVENT_CHANGED, _colsel_cb, win));
efl_pack(box2, o);
for (size_t k = 0; k < EINA_C_ARRAY_LENGTH(colors); k++)
elm_colorselector_palette_color_add(o, colors[k].r, colors[k].g, colors[k].b, colors[k].a);
efl_gfx_visible_set(box2, 1);
}
/* FIXME: No panes in EO APIs. */
o = split = efl_add(ELM_PANES_CLASS, win,
efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_orientation_set(efl_added, EFL_ORIENT_HORIZONTAL),
efl_gfx_visible_set(efl_added, 1));
efl_orientation_set(efl_added, EFL_ORIENT_HORIZONTAL));
efl_pack(box, split);
{
flip = efl_add(EFL_UI_FLIP_CLASS, win,
efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_gfx_visible_set(efl_added, 1));
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0));
efl_content_set(efl_part(split, "top"), flip);
box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win,
efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_pack_align_set(efl_added, 0.5, 0.5),
efl_gfx_visible_set(efl_added, 1));
efl_pack_align_set(efl_added, 0.5, 0.5));
efl_pack(flip, box2);
// Note: No TEXT object with EO APIs
@ -507,7 +495,6 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_canvas_object_scale_set(o, elm_config_scale_get());
efl_pack(box2, o);
evas_object_resize(o, 1, 1);
efl_gfx_visible_set(o, 1);
}
{
@ -546,5 +533,4 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
_spinner_cb(win, NULL);
efl_gfx_size_set(win, 500, 600);
efl_gfx_visible_set(win, 1);
}

1
src/bin/elementary/test_glview.c
View File

@ -729,7 +729,6 @@ _test_glview_do(Evas_GL_Context_Version version)
evas_object_smart_callback_add(bt, "clicked", _on_done, win);
evas_object_resize(win, 320, 480);
evas_object_show(win);
}
void

7
src/bin/elementary/test_grid_static.c
View File

@ -114,7 +114,6 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_size_hint_weight_set(efl_added, 1, 1));
efl_content_set(win, gd);
api->data.grid = gd;
efl_gfx_visible_set(gd, 1);
/* FIXME: EO-ify entry & button & test_set! */
@ -169,28 +168,22 @@ test_grid_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
efl_gfx_color_set(rc, 128, 0, 0, 128);
efl_pack_grid(gd, rc, 40, 70, 20, 10);
efl_gfx_visible_set(rc, 1);
rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
efl_gfx_color_set(rc, 0, 128, 0, 128);
efl_pack_grid(gd, rc, 60, 70, 10, 10);
efl_gfx_visible_set(rc, 1);
rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
efl_gfx_color_set(rc, 0, 0, 128, 128);
efl_pack_grid(gd, rc, 40, 80, 10, 10);
efl_gfx_visible_set(rc, 1);
rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
efl_gfx_color_set(rc, 128, 0, 128, 128);
efl_pack_grid(gd, rc, 50, 80, 10, 10);
efl_gfx_visible_set(rc, 1);
rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
efl_gfx_color_set(rc, 128, 64, 0, 128);
efl_pack_grid(gd, rc, 60, 80, 10, 10);
efl_gfx_visible_set(rc, 1);
efl_gfx_size_set(win, 480, 480);
efl_gfx_visible_set(win, 1);
}

1
src/bin/elementary/test_nstate.c
View File

@ -33,7 +33,6 @@ test_nstate(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_ui_nstate_count_set(nstate, 5);
elm_object_text_set(nstate, "nstate = 0");
elm_box_pack_end(bx, nstate);
evas_object_show(nstate);
evas_object_smart_callback_add(nstate, "state,changed",
_state_changed_cb, NULL);

8
src/bin/elementary/test_photocam.c
View File

@ -813,15 +813,12 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
bx = efl_add(EFL_UI_BOX_CLASS, win,
efl_orientation_set(efl_added, EFL_ORIENT_DOWN),
efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND),
efl_content_set(win, efl_added),
efl_gfx_visible_set(efl_added, EINA_TRUE)
);
efl_content_set(win, efl_added));
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_text_set(efl_added, "Clicking the image will play/pause animation."),
efl_ui_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_canvas_text_style_set(efl_added, NULL, "DEFAULT='align=center font=Sans font_size=10 color=#fff wrap=word'"),
efl_gfx_visible_set(efl_added, EINA_TRUE),
efl_pack(bx, efl_added)
);
@ -830,7 +827,6 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
efl_file_set(efl_added, buf, NULL),
efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND),
efl_gfx_size_hint_align_set(efl_added, EFL_GFX_SIZE_HINT_FILL, EFL_GFX_SIZE_HINT_FILL),
efl_gfx_visible_set(efl_added, EINA_TRUE),
efl_pack(bx, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _zoomable_clicked_cb, NULL)
);
@ -843,7 +839,6 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win,
efl_gfx_color_set(efl_added, 0, 0, 0, 0),
efl_gfx_visible_set(efl_added, EINA_TRUE),
efl_gfx_stack_raise(efl_added),
efl_canvas_object_repeat_events_set(efl_added, EINA_TRUE),
efl_event_callback_add(efl_added, EFL_EVENT_POINTER_WHEEL, _zoomable_mouse_wheel_cb, zoomable)
@ -854,5 +849,4 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
efl_event_callback_add(zoomable, EFL_GFX_EVENT_MOVE, _zoomable_move_resize_cb, rect);
efl_gfx_size_set(win, 300, 320);
efl_gfx_visible_set(win, EINA_TRUE);
}

9
src/bin/elementary/test_ui_box.c
View File

@ -227,7 +227,6 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_weight_set(vbox, 1, 1);
efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5);
elm_win_resize_object_add(win, vbox);
efl_gfx_visible_set(vbox, 1);
/* controls */
@ -241,7 +240,6 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
hbox = efl_add(EFL_UI_BOX_CLASS, win);
elm_object_content_set(f, hbox);
efl_pack_padding_set(hbox, 10, 0, EINA_TRUE);
efl_gfx_visible_set(hbox, 1);
/* weights radio group */
@ -249,7 +247,6 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_orientation_set(efl_added, EFL_ORIENT_DOWN));
efl_gfx_size_hint_align_set(bx, 0, -1);
efl_pack(hbox, bx);
efl_gfx_visible_set(bx, 1);
chk = o = elm_radio_add(win);
elm_object_text_set(o, "No weight");
@ -304,7 +301,6 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_align_set(bx, 0, -1);
efl_gfx_size_hint_weight_set(bx, 0, 1);
efl_pack(hbox, bx);
efl_gfx_visible_set(bx, 1);
o = elm_label_add(win);
elm_object_text_set(o, "Misc");
@ -359,7 +355,6 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_align_set(bx, 0, -1);
efl_gfx_size_hint_weight_set(bx, 0, 1);
efl_pack(hbox, bx);
efl_gfx_visible_set(bx, 1);
o = elm_label_add(win);
elm_object_text_set(o, "User min size");
@ -386,7 +381,6 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_align_set(bx, 0, -1);
efl_gfx_size_hint_weight_set(bx, 0, 1);
efl_pack(hbox, bx);
efl_gfx_visible_set(bx, 1);
o = elm_label_add(win);
elm_object_text_set(o, "Padding");
@ -413,7 +407,6 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_align_set(bx, 0, -1);
efl_gfx_size_hint_weight_set(bx, 0, 1);
efl_pack(hbox, bx);
efl_gfx_visible_set(bx, 1);
o = elm_label_add(win);
elm_object_text_set(o, "Margin");
@ -440,7 +433,6 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_align_set(bx, 0, -1);
efl_gfx_size_hint_weight_set(bx, 1, 1);
efl_pack(hbox, bx);
efl_gfx_visible_set(bx, 1);
o = elm_label_add(win);
elm_object_text_set(o, "Box align");
@ -489,7 +481,6 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
efl_gfx_size_hint_align_set(bx, 0.5, 0.5);
efl_gfx_size_hint_weight_set(bx, 1, 1);
elm_object_content_set(f, bx);
efl_gfx_visible_set(bx, 1);
objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Btn1");

5
src/bin/elementary/test_ui_clock.c
View File

@ -68,7 +68,6 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_ui_clock_pause_set(dt1, EINA_TRUE);
elm_box_pack_end(bx, dt1);
evas_object_smart_callback_add(dt1, "changed", _changed_cb, NULL);
evas_object_show(dt1);
dt2 = efl_add(EFL_UI_CLOCK_CLASS, bx);
evas_object_size_hint_weight_set(dt2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@ -80,13 +79,11 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
elm_box_pack_end(bx, dt2);
efl_ui_clock_pause_set(dt2, EINA_TRUE);
elm_object_disabled_set(dt2, EINA_TRUE);
evas_object_show(dt2);
dt3 = efl_add(EFL_UI_CLOCK_CLASS, bx);
evas_object_size_hint_weight_set(dt3, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(dt3, EVAS_HINT_FILL, 0.5);
elm_box_pack_end(bx, dt3);
evas_object_show(dt3);
//editable
lb = efl_add(ELM_LABEL_CLASS, bx);
@ -97,7 +94,6 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
evas_object_size_hint_align_set(lb, 0, EVAS_HINT_FILL);
evas_object_size_hint_min_set(lb, 100, 25);
elm_box_pack_end(bx, lb);
evas_object_show(lb);
dt4 = efl_add(EFL_UI_CLOCK_CLASS, bx);
evas_object_size_hint_weight_set(dt4, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@ -105,7 +101,6 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_ui_clock_edit_mode_set(dt4, EINA_TRUE);
efl_ui_clock_pause_set(dt4, EINA_TRUE);
elm_box_pack_end(bx, dt4);
evas_object_show(dt4);
bt = elm_button_add(win);
elm_object_text_set(bt, "Back to the future...");

9
src/bin/elementary/test_ui_grid.c
View File

@ -183,7 +183,6 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_gfx_size_hint_weight_set(vbox, 1, 1);
efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5);
elm_win_resize_object_add(win, vbox);
efl_gfx_visible_set(vbox, 1);
// create here to pass in cb
@ -201,7 +200,6 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
hbox = efl_add(EFL_UI_BOX_CLASS, win);
elm_object_content_set(f, hbox);
efl_pack_padding_set(hbox, 10, 0, EINA_TRUE);
efl_gfx_visible_set(hbox, 1);
/* weights radio group */
@ -209,7 +207,6 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_orientation_set(efl_added, EFL_ORIENT_DOWN));
efl_gfx_size_hint_align_set(bx, 0, -1);
efl_pack(hbox, bx);
efl_gfx_visible_set(bx, 1);
chk = o = elm_radio_add(win);
elm_object_text_set(o, "No weight");
@ -273,7 +270,6 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_gfx_size_hint_align_set(bx, 0.5, -1);
efl_gfx_size_hint_weight_set(bx, 0, 1);
efl_pack(hbox, bx);
efl_gfx_visible_set(bx, 1);
o = elm_label_add(win);
elm_object_text_set(o, "User min size");
@ -300,7 +296,6 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_gfx_size_hint_align_set(bx, 0, -1);
efl_gfx_size_hint_weight_set(bx, 0, 1);
efl_pack(hbox, bx);
efl_gfx_visible_set(bx, 1);
o = elm_label_add(win);
elm_object_text_set(o, "Padding");
@ -327,7 +322,6 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_gfx_size_hint_align_set(bx, 0, -1);
efl_gfx_size_hint_weight_set(bx, 0, 1);
efl_pack(hbox, bx);
efl_gfx_visible_set(bx, 1);
o = elm_label_add(win);
elm_object_text_set(o, "Margin");
@ -354,7 +348,6 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_gfx_size_hint_align_set(bx, 0, -1);
efl_gfx_size_hint_weight_set(bx, 1, 1);
efl_pack(hbox, bx);
efl_gfx_visible_set(bx, 1);
o = elm_label_add(win);
elm_object_text_set(o, "Buttons margins");
@ -381,7 +374,6 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_gfx_size_hint_align_set(bx, 0, -1);
efl_gfx_size_hint_weight_set(bx, 1, 1);
efl_pack(hbox, bx);
efl_gfx_visible_set(bx, 1);
o = elm_label_add(win);
elm_object_text_set(o, "<b>Properties</>");
@ -420,7 +412,6 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_gfx_size_hint_min_set(o, 10, 10);
efl_gfx_color_set(o, 64, 96, 128, 255);
efl_pack_grid(grid, o, 0, 0, 3, 1);
efl_gfx_visible_set(o, 1);
objects[i++] = o = elm_button_add(win);
elm_object_text_set(o, "Button 1");

5
src/bin/elementary/test_win_dialog.c
View File

@ -46,8 +46,6 @@ _bt2_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
// Swallow in the label as the default content, this will make it visible.
efl_content_set(dia, lb);
efl_gfx_visible_set(dia, EINA_TRUE);
}
static void
@ -95,8 +93,6 @@ _bt3_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
// Set min & max size (app-side)
efl_gfx_size_hint_min_set(dia, ELM_SCALE_SIZE(0), ELM_SCALE_SIZE(100));
efl_gfx_size_hint_max_set(dia, ELM_SCALE_SIZE(800), ELM_SCALE_SIZE(600));
efl_gfx_visible_set(dia, EINA_TRUE);
}
static void
@ -126,7 +122,6 @@ _bt4_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
efl_gfx_size_hint_max_set(dia, ELM_SCALE_SIZE(800), ELM_SCALE_SIZE(600));
efl_ui_win_center(dia, EINA_TRUE, EINA_TRUE);
efl_gfx_visible_set(dia, EINA_TRUE);
}
void

1
src/bin/elementary/test_win_inline.c
View File

@ -228,7 +228,6 @@ test_win_inline(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
box = efl_add(EFL_UI_BOX_CLASS, win);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, box);
evas_object_show(box);
win2 = elm_win_add(win, "inlined", ELM_WIN_INLINED_IMAGE);
evas_object_event_callback_add(elm_win_inlined_image_object_get(win2), EVAS_CALLBACK_MOUSE_DOWN, cb_mouse_down, NULL);

1
src/bin/elementary/test_win_stack.c
View File

@ -88,7 +88,6 @@ _bt_pressed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUS
snprintf(buf, sizeof(buf), "Level %i", level);
win = _win_new(data, buf);
efl_ui_win_stack_master_id_set(win, efl_ui_win_stack_id_get(data));
evas_object_show(win);
}
void