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

efl_ui_win: default the window type to basic 

normally when you create a window, you just want to have it beeing a
basic window. If not you still can set the window type.

ref T8229

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Differential Revision: https://phab.enlightenment.org/D10049
This commit is contained in:
Marcel Hollerbach 2019-09-20 14:57:09 +02:00
parent 5493cc5396
commit 594fc08442
41 changed files with 78 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/benchmarks/elementary/collection.c
View File

@ -155,7 +155,6 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
}
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Item_Container benchmark"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)
);

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

@ -142,7 +142,6 @@ test_efl_ui_animation_view(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
char buf[255];
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl_Ui_Animation_View demo"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
@ -297,7 +296,6 @@ test_efl_ui_animation_view(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
char buf[255];
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl_Ui_Animation_View demo"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

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

@ -42,7 +42,6 @@ test_efl_ui_text_label(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
char *markup;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Canvas_Layout"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
@ -146,7 +145,6 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
Eo *bt;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Ui Text"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
@ -205,7 +203,6 @@ test_efl_ui_text_inputfield(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
Eo *win, *bx, *en;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Ui Text Input Field"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
@ -295,7 +292,6 @@ test_ui_text_item_factory(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
Eina_File *f;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Ui Text Item Factory"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

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

@ -806,7 +806,6 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
char buf[PATH_MAX];
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Image_Zoomable animation"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

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

@ -30,7 +30,6 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
char buf[PATH_MAX];
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Button"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)
);

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

@ -49,7 +49,6 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
Evas_Object *win, *bx;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Clock"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

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

@ -176,7 +176,6 @@ void create_item_container_ui(const Efl_Class *collection_class, const Efl_Class
Match_Content_Ctx *ctx = calloc(1, sizeof(*ctx));
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, name),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
tbl = efl_add(EFL_UI_TABLE_CLASS, win);

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

@ -19,7 +19,6 @@ test_ui_datepicker(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
Eo *win, *bx;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Datepicker"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

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

@ -16,7 +16,6 @@ test_ui_frame(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
Eo *win, *bx, *f, *txt;
win = efl_add_ref(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Frame"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

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

@ -54,7 +54,6 @@ void test_efl_ui_item(void *data EINA_UNUSED,
Eo *win, *box, *o;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Item examples"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)
);

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

@ -701,7 +701,6 @@ void test_ui_pager(void *data EINA_UNUSED,
int i;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Pager"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

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

@ -901,7 +901,6 @@ void test_ui_pager_scroll(void *data EINA_UNUSED,
int i;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Pager"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

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

@ -11,7 +11,6 @@ test_ui_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
Eo *win, *table, *panel;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Panel"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
@ -104,7 +103,6 @@ test_ui_panel2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
Eo *win, *box, *check, *btn, *table, *list, *panel;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Panel"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

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

@ -10,7 +10,6 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
Eo *win, *panes, *panes_h;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Panes"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)
);

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

@ -152,7 +152,6 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
pd = (pbdata *)calloc(1, sizeof(pbdata));
pd->win = win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Progressbar"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE),
efl_event_callback_add(efl_added, EFL_UI_WIN_EVENT_DELETE_REQUEST,

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

@ -96,7 +96,6 @@ void test_efl_ui_radio(void *data EINA_UNUSED,
Efl_Ui_Button *o;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Radio_Box"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
table = efl_add(EFL_UI_TABLE_CLASS, win);

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

@ -276,7 +276,6 @@ test_ui_relative_layout(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo
Eo *win, *vbox, *f, *hbox;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Relative_Layout"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

3
src/bin/elementary/test_ui_scroller.c
View File

@ -32,7 +32,6 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
int i, j;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Ui Scroller"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
@ -137,7 +136,6 @@ test_efl_ui_scroller_simple(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
int i;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Ui Scroller Simple"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
@ -173,7 +171,6 @@ test_efl_ui_scroller_simple2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
int i;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Ui Scroller Simple2"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));

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

@ -53,7 +53,6 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
Eo *win, *bx, *hbx;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Slider"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

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

@ -34,7 +34,6 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
double step;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Slider_Interval"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

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

@ -40,7 +40,6 @@ test_ui_spin(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
Eo *win, *bx, *sp;
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Spin"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

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

@ -29,7 +29,6 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
};
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Spin_Button"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

3
src/bin/elementary/test_ui_spotlight.c
View File

@ -856,7 +856,6 @@ test_ui_spotlight_stack(void *data EINA_UNUSED,
int i;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Spotlight Stack"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
@ -955,7 +954,6 @@ test_ui_spotlight_plain(void *data EINA_UNUSED,
int i;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Spotlight Plain"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
@ -1050,7 +1048,6 @@ test_ui_spotlight_scroll(void *data EINA_UNUSED,
int i;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Spotlight Scroll"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

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

@ -104,7 +104,6 @@ test_ui_tab_pager(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev
int i;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Tab_Pager"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, _win_del_cb, ad));

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

@ -60,7 +60,6 @@ test_ui_tags(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
char buf[PATH_MAX];
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Tags"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

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

@ -20,7 +20,6 @@ test_ui_timepicker(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
Eo *win, *bx;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Timepicker"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

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

@ -93,7 +93,6 @@ test_win_indicator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
// FIXME: Resizing window should no cause sizing issues!
win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Win.Indicator"),
efl_gfx_hint_size_max_set(efl_added, EINA_SIZE2D(300, -1)),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

1
src/examples/elementary/efl_canvas_layout_text.c
View File

@ -121,7 +121,6 @@ efl_main(void *data EINA_UNUSED,
Eo *win;
win = efl_add(EFL_UI_WIN_CLASS, NULL,
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl Canvas_Layout"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE),
efl_event_callback_add(efl_added, EFL_UI_WIN_EVENT_DELETE_REQUEST, _on_win_delete, NULL));

1
src/examples/elementary/efl_ui_grid_example_1.c
View File

@ -23,7 +23,6 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
Efl_Ui_Item *gitem;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Grid"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

1
src/examples/elementary/efl_ui_list_example_1.c
View File

@ -110,7 +110,6 @@ elm_main(int argc EINA_UNUSED, char **argv)
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.List"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

1
src/examples/elementary/efl_ui_radio_example_01.c
View File

@ -25,7 +25,6 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Radio example"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)
);

1
src/examples/elementary/efl_ui_relative_layout_example_01.c
View File

@ -16,7 +16,6 @@ elm_main(int argc, char **argv)
Eo *win, *layout, *btn1, *btn2, *btn3;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Relative_Layout"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

1
src/examples/elementary/efl_ui_relative_layout_example_02.c
View File

@ -16,7 +16,6 @@ elm_main(int argc, char **argv)
Eo *win, *layout, *btn1, *btn2;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Relative_Layout"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));

1
src/examples/elementary/efl_ui_theme_example_01.c
View File

@ -52,7 +52,6 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
efl_ui_theme_extension_add(default_theme, EXAMPLE_EDJ_FILE_PATH);
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Theme example"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)
);

1
src/examples/elementary/efl_ui_theme_example_02.c
View File

@ -52,7 +52,6 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
efl_ui_theme_overlay_add(default_theme, EXAMPLE_EDJ_FILE_PATH);
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Efl.Ui.Theme example"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)
);

3
src/lib/elementary/efl_ui_win.c
View File

@ -5960,6 +5960,9 @@ _efl_ui_win_efl_object_constructor(Eo *obj, Efl_Ui_Win_Data *pd)
if (!efl_parent_get(obj))
efl_allow_parent_unref_set(obj, EINA_TRUE);
if (elm_widget_is_legacy(obj))
pd->type = EFL_UI_WIN_TYPE_BASIC;
return obj;
}

2
src/lib/elementary/efl_ui_win.eo
View File

@ -443,7 +443,7 @@ class Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Access.W
[[If the object is not window object, returns $unknown.]]
}
values {
type: Efl.Ui.Win_Type(Efl.Ui.Win_Type.unknown); [[Window type]]
type: Efl.Ui.Win_Type(Efl.Ui.Win_Type.basic); [[Window type]]
}
}
@property accel_preference @beta {

4
src/tests/elementary/efl_ui_test_widget.c
View File

@ -19,7 +19,6 @@ static void
_small_ui(State *s)
{
s->win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Hello World"));
s->ic = efl_add(EFL_UI_IMAGE_CLASS, s->win,
@ -233,7 +232,6 @@ EFL_START_TEST(efl_ui_test_widget_parent_relation)
Efl_Ui_Win *win, *w1, *w2, *w3;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Hello World"));
//first check the initial state
w1 = efl_add(efl_ui_widget_realized_class_get(), win);
@ -257,7 +255,6 @@ EFL_START_TEST(efl_ui_test_widget_disabled_parent)
Efl_Ui_Win *win, *w1, *w2, *t;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Hello World"));
//first check the initial state
w1 = efl_add(efl_ui_widget_realized_class_get(), win);
@ -293,7 +290,6 @@ EFL_START_TEST(efl_ui_test_widget_disabled_behaviour)
Efl_Ui_Win *win, *w1, *w2, *t;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Hello World"));
//first check the initial state
w1 = efl_add(efl_ui_widget_realized_class_get(), win);

12
src/tests/elementary/efl_ui_test_win.c
View File

@ -433,6 +433,17 @@ EFL_START_TEST(efl_ui_win_test_efl_input_interface_pointer_cancel)
ck_assert_int_eq(called, 2);
}
EFL_END_TEST
EFL_START_TEST(efl_ui_win_test_type)
{
Efl_Ui_Win *win;
win = win_add();
ck_assert_int_eq(efl_ui_win_type_get(win), EFL_UI_WIN_TYPE_BASIC);
}
EFL_END_TEST
void
efl_ui_test_win(TCase *tc)
{
@ -447,4 +458,5 @@ efl_ui_test_win(TCase *tc)
tcase_add_test(tc, efl_ui_win_test_efl_input_interface_pointer_in_out);
tcase_add_test(tc, efl_ui_win_test_efl_input_interface_pointer_wheel);
tcase_add_test(tc, efl_ui_win_test_efl_input_interface_pointer_cancel);
tcase_add_test(tc, efl_ui_win_test_type);
}

13
src/tests/elementary/elm_test_win.c
View File

@ -465,6 +465,18 @@ EFL_START_TEST(elm_win_test_rotation)
}
EFL_END_TEST
EFL_START_TEST(elm_win_test_default_type)
{
Evas_Object *win;
win = elm_win_add(NULL, "test win default type", ELM_WIN_UNKNOWN);
ck_assert_int_eq(elm_win_type_get(win), ELM_WIN_UNKNOWN);
win = elm_win_util_standard_add("test win default type", "test");
ck_assert_int_eq(elm_win_type_get(win), ELM_WIN_BASIC);
}
EFL_END_TEST
void elm_test_win(TCase *tc)
{
tcase_add_test(tc, elm_win_legacy_type_check);
@ -475,6 +487,7 @@ void elm_test_win(TCase *tc)
tcase_add_test(tc, elm_win_test_app_exit_on_windows_close);
tcase_add_test(tc, efl_ui_win_multi_touch_inputs);
tcase_add_test(tc, elm_win_test_rotation);
tcase_add_test(tc, elm_win_test_default_type);
#ifdef HAVE_ELEMENTARY_X
tcase_add_test(tc, elm_win_autohide);
tcase_add_test(tc, elm_win_autohide_and_policy_quit_last_window_hidden);

2
src/tests/elementary/suite_helpers.c
View File

@ -201,7 +201,7 @@ _elm_suite_win_create()
if (legacy_mode)
win = elm_win_add(NULL, "elm_suite", ELM_WIN_BASIC);
else
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC));
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get());
if (!buffer) return win;
loop = efl_add(efl_loop_realized_class_get(), win);
timer = efl_add(EFL_LOOP_TIMER_CLASS, loop,