summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-04 13:37:24 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-03-04 13:37:24 -0500
commite3fa213d100ddb733d66830bb72525df07813c2b (patch)
tree2d2c3b04dcb90bd566fec43da4b68cdf23edeeb4 /src
parentbc0c50c5077467c5a1995bc2cdec861b5ebc313f (diff)
efl.ui.win: remove all legacy types and functions from eo file
Summary: most of the eo methods here will be marked beta, preventing them from generating legacy code ref T7511 Depends on D8082 Reviewers: cedric Reviewed By: cedric Subscribers: cedric, #reviewers, #committers Tags: #efl_api Maniphest Tasks: T7511 Differential Revision: https://phab.enlightenment.org/D8083
Diffstat (limited to 'src')
-rw-r--r--src/bin/elementary/test_efl_ui_text.c8
-rw-r--r--src/bin/elementary/test_photocam.c2
-rw-r--r--src/bin/elementary/test_ui_button.c2
-rw-r--r--src/bin/elementary/test_ui_clock.c2
-rw-r--r--src/bin/elementary/test_ui_datepicker.c2
-rw-r--r--src/bin/elementary/test_ui_pager.c2
-rw-r--r--src/bin/elementary/test_ui_pager_scroll.c2
-rw-r--r--src/bin/elementary/test_ui_panel.c4
-rw-r--r--src/bin/elementary/test_ui_panes.c2
-rw-r--r--src/bin/elementary/test_ui_progressbar.c2
-rw-r--r--src/bin/elementary/test_ui_relative_layout.c2
-rw-r--r--src/bin/elementary/test_ui_scroller.c2
-rw-r--r--src/bin/elementary/test_ui_slider.c2
-rw-r--r--src/bin/elementary/test_ui_slider_interval.c2
-rw-r--r--src/bin/elementary/test_ui_spin.c2
-rw-r--r--src/bin/elementary/test_ui_spin_button.c2
-rw-r--r--src/bin/elementary/test_ui_tab_pager.c2
-rw-r--r--src/bin/elementary/test_ui_tags.c2
-rw-r--r--src/bin/elementary/test_ui_timepicker.c2
-rw-r--r--src/bin/elementary/test_win_dialog.c6
-rw-r--r--src/bin/elementary/test_win_indicator.c10
-rw-r--r--src/bin/elementary/test_win_stack.c4
-rw-r--r--src/bin/elementary/test_win_state.c18
-rw-r--r--src/examples/elementary/efl_canvas_layout_text.c2
-rw-r--r--src/examples/elementary/efl_ui_grid_example_1.c2
-rw-r--r--src/examples/elementary/efl_ui_relative_layout_example_01.c2
-rw-r--r--src/examples/elementary/efl_ui_relative_layout_example_02.c2
-rw-r--r--src/examples/elementary/efl_ui_theme_example_01.c2
-rw-r--r--src/examples/elementary/efl_ui_theme_example_02.c2
-rw-r--r--src/examples/elementary/toolbar_cxx_example_01.cc2
-rw-r--r--src/lib/elementary/efl_ui_win.c488
-rw-r--r--src/lib/elementary/efl_ui_win.eo35
-rw-r--r--src/lib/elementary/efl_ui_win_inlined.c2
-rw-r--r--src/lib/elementary/efl_ui_win_socket.c2
-rw-r--r--src/lib/elementary/elm_win_legacy.h793
-rw-r--r--src/tests/elementary/efl_ui_test_image.c2
-rw-r--r--src/tests/elementary/efl_ui_test_image_zoomable.c2
-rw-r--r--src/tests/elementary/efl_ui_test_layout.c10
-rw-r--r--src/tests/elementary/efl_ui_test_relative_layout.c2
-rw-r--r--src/tests/elementary/efl_ui_test_widget.c2
-rw-r--r--src/tests/elementary/suite_helpers.c2
41 files changed, 1212 insertions, 226 deletions
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index 9cc2a322f4..d7aa2a44e4 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -41,7 +41,7 @@ test_efl_ui_text_label(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
41 char *markup; 41 char *markup;
42 42
43 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 43 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
44 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 44 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
45 efl_text_set(efl_added, "Efl Canvas_Layout"), 45 efl_text_set(efl_added, "Efl Canvas_Layout"),
46 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 46 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
47 47
@@ -145,7 +145,7 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
145 Eo *bt; 145 Eo *bt;
146 146
147 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 147 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
148 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 148 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
149 efl_text_set(efl_added, "Efl Ui Text"), 149 efl_text_set(efl_added, "Efl Ui Text"),
150 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 150 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
151 151
@@ -204,7 +204,7 @@ test_efl_ui_text_inputfield(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
204 Eo *win, *bx, *en; 204 Eo *win, *bx, *en;
205 205
206 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 206 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
207 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 207 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
208 efl_text_set(efl_added, "Efl Ui Text Input Field"), 208 efl_text_set(efl_added, "Efl Ui Text Input Field"),
209 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 209 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
210 210
@@ -294,7 +294,7 @@ test_ui_text_item_factory(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
294 Eina_File *f; 294 Eina_File *f;
295 295
296 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 296 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
297 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 297 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
298 efl_text_set(efl_added, "Efl Ui Text Item Factory"), 298 efl_text_set(efl_added, "Efl Ui Text Item Factory"),
299 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 299 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
300 300
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index f00662069f..44da46a18d 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -805,7 +805,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
805 char buf[PATH_MAX]; 805 char buf[PATH_MAX];
806 806
807 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 807 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
808 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 808 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
809 efl_text_set(efl_added, "Efl.Ui.Image_Zoomable animation"), 809 efl_text_set(efl_added, "Efl.Ui.Image_Zoomable animation"),
810 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 810 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
811 811
diff --git a/src/bin/elementary/test_ui_button.c b/src/bin/elementary/test_ui_button.c
index f89a188407..7c5cce3c34 100644
--- a/src/bin/elementary/test_ui_button.c
+++ b/src/bin/elementary/test_ui_button.c
@@ -28,7 +28,7 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
28 char buf[PATH_MAX]; 28 char buf[PATH_MAX];
29 29
30 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 30 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
31 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 31 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
32 efl_text_set(efl_added, "Efl.Ui.Button"), 32 efl_text_set(efl_added, "Efl.Ui.Button"),
33 efl_ui_win_autodel_set(efl_added, EINA_TRUE) 33 efl_ui_win_autodel_set(efl_added, EINA_TRUE)
34 ); 34 );
diff --git a/src/bin/elementary/test_ui_clock.c b/src/bin/elementary/test_ui_clock.c
index 4a0fa1182b..d759250ef2 100644
--- a/src/bin/elementary/test_ui_clock.c
+++ b/src/bin/elementary/test_ui_clock.c
@@ -48,7 +48,7 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
48 Evas_Object *win, *bx; 48 Evas_Object *win, *bx;
49 49
50 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 50 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
51 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 51 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
52 efl_text_set(efl_added, "Efl.Ui.Clock"), 52 efl_text_set(efl_added, "Efl.Ui.Clock"),
53 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 53 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
54 54
diff --git a/src/bin/elementary/test_ui_datepicker.c b/src/bin/elementary/test_ui_datepicker.c
index 1eb04612b1..6c2e631e41 100644
--- a/src/bin/elementary/test_ui_datepicker.c
+++ b/src/bin/elementary/test_ui_datepicker.c
@@ -18,7 +18,7 @@ test_ui_datepicker(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
18 Eo *win, *bx; 18 Eo *win, *bx;
19 19
20 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 20 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
21 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 21 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
22 efl_text_set(efl_added, "Efl.Ui.Datepicker"), 22 efl_text_set(efl_added, "Efl.Ui.Datepicker"),
23 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 23 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
24 24
diff --git a/src/bin/elementary/test_ui_pager.c b/src/bin/elementary/test_ui_pager.c
index cebbbad641..a5714ec5a1 100644
--- a/src/bin/elementary/test_ui_pager.c
+++ b/src/bin/elementary/test_ui_pager.c
@@ -678,7 +678,7 @@ void test_ui_pager(void *data EINA_UNUSED,
678 int i; 678 int i;
679 679
680 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 680 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
681 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 681 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
682 efl_text_set(efl_added, "Pager"), 682 efl_text_set(efl_added, "Pager"),
683 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 683 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
684 684
diff --git a/src/bin/elementary/test_ui_pager_scroll.c b/src/bin/elementary/test_ui_pager_scroll.c
index 7a0bfb83eb..33c24be5b0 100644
--- a/src/bin/elementary/test_ui_pager_scroll.c
+++ b/src/bin/elementary/test_ui_pager_scroll.c
@@ -859,7 +859,7 @@ void test_ui_pager_scroll(void *data EINA_UNUSED,
859 int i; 859 int i;
860 860
861 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 861 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
862 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 862 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
863 efl_text_set(efl_added, "Pager"), 863 efl_text_set(efl_added, "Pager"),
864 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 864 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
865 865
diff --git a/src/bin/elementary/test_ui_panel.c b/src/bin/elementary/test_ui_panel.c
index e73a3186d6..6b612e49fb 100644
--- a/src/bin/elementary/test_ui_panel.c
+++ b/src/bin/elementary/test_ui_panel.c
@@ -10,7 +10,7 @@ test_ui_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
10 Eo *win, *table, *panel; 10 Eo *win, *table, *panel;
11 11
12 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 12 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
13 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 13 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
14 efl_text_set(efl_added, "Efl.Ui.Panel"), 14 efl_text_set(efl_added, "Efl.Ui.Panel"),
15 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 15 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
16 16
@@ -103,7 +103,7 @@ test_ui_panel2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
103 Eo *win, *box, *check, *btn, *table, *list, *panel; 103 Eo *win, *box, *check, *btn, *table, *list, *panel;
104 104
105 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 105 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
106 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 106 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
107 efl_text_set(efl_added, "Efl.Ui.Panel"), 107 efl_text_set(efl_added, "Efl.Ui.Panel"),
108 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 108 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
109 109
diff --git a/src/bin/elementary/test_ui_panes.c b/src/bin/elementary/test_ui_panes.c
index 3dcf010929..2c3e274f9b 100644
--- a/src/bin/elementary/test_ui_panes.c
+++ b/src/bin/elementary/test_ui_panes.c
@@ -9,7 +9,7 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
9 Eo *win, *panes, *panes_h; 9 Eo *win, *panes, *panes_h;
10 10
11 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 11 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
12 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 12 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
13 efl_text_set(efl_added, "Efl.Ui.Panes"), 13 efl_text_set(efl_added, "Efl.Ui.Panes"),
14 efl_ui_win_autodel_set(efl_added, EINA_TRUE) 14 efl_ui_win_autodel_set(efl_added, EINA_TRUE)
15 ); 15 );
diff --git a/src/bin/elementary/test_ui_progressbar.c b/src/bin/elementary/test_ui_progressbar.c
index 16848ef5b1..3300a037e3 100644
--- a/src/bin/elementary/test_ui_progressbar.c
+++ b/src/bin/elementary/test_ui_progressbar.c
@@ -118,7 +118,7 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
118 pd = (pbdata *)calloc(1, sizeof(pbdata)); 118 pd = (pbdata *)calloc(1, sizeof(pbdata));
119 119
120 pd->win = win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 120 pd->win = win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
121 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 121 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
122 efl_text_set(efl_added, "Efl.Ui.Progressbar"), 122 efl_text_set(efl_added, "Efl.Ui.Progressbar"),
123 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 123 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
124 efl_event_callback_add(efl_added, EFL_UI_WIN_EVENT_DELETE_REQUEST, 124 efl_event_callback_add(efl_added, EFL_UI_WIN_EVENT_DELETE_REQUEST,
diff --git a/src/bin/elementary/test_ui_relative_layout.c b/src/bin/elementary/test_ui_relative_layout.c
index 24546cad14..825af48e62 100644
--- a/src/bin/elementary/test_ui_relative_layout.c
+++ b/src/bin/elementary/test_ui_relative_layout.c
@@ -264,7 +264,7 @@ test_ui_relative_layout(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo
264 Eo *win, *vbox, *f, *hbox; 264 Eo *win, *vbox, *f, *hbox;
265 265
266 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 266 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
267 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 267 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
268 efl_text_set(efl_added, "Efl.Ui.Relative_Layout"), 268 efl_text_set(efl_added, "Efl.Ui.Relative_Layout"),
269 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 269 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
270 270
diff --git a/src/bin/elementary/test_ui_scroller.c b/src/bin/elementary/test_ui_scroller.c
index 3a43a43902..ee751d2369 100644
--- a/src/bin/elementary/test_ui_scroller.c
+++ b/src/bin/elementary/test_ui_scroller.c
@@ -31,7 +31,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
31 int i, j; 31 int i, j;
32 32
33 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 33 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
34 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 34 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
35 efl_text_set(efl_added, "Efl Ui Scroller"), 35 efl_text_set(efl_added, "Efl Ui Scroller"),
36 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 36 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
37 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400)); 37 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
diff --git a/src/bin/elementary/test_ui_slider.c b/src/bin/elementary/test_ui_slider.c
index 66bfe0f2f8..661d63eb5b 100644
--- a/src/bin/elementary/test_ui_slider.c
+++ b/src/bin/elementary/test_ui_slider.c
@@ -33,7 +33,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
33 double step; 33 double step;
34 34
35 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 35 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
36 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 36 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
37 efl_text_set(efl_added, "Efl.Ui.Slider"), 37 efl_text_set(efl_added, "Efl.Ui.Slider"),
38 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 38 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
39 39
diff --git a/src/bin/elementary/test_ui_slider_interval.c b/src/bin/elementary/test_ui_slider_interval.c
index 09589a7689..5fa9350d13 100644
--- a/src/bin/elementary/test_ui_slider_interval.c
+++ b/src/bin/elementary/test_ui_slider_interval.c
@@ -33,7 +33,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
33 double step; 33 double step;
34 34
35 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 35 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
36 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 36 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
37 efl_text_set(efl_added, "Efl.Ui.Slider_Interval"), 37 efl_text_set(efl_added, "Efl.Ui.Slider_Interval"),
38 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 38 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
39 39
diff --git a/src/bin/elementary/test_ui_spin.c b/src/bin/elementary/test_ui_spin.c
index 85945a3101..33826a0568 100644
--- a/src/bin/elementary/test_ui_spin.c
+++ b/src/bin/elementary/test_ui_spin.c
@@ -37,7 +37,7 @@ test_ui_spin(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
37 Eo *win, *bx, *sp; 37 Eo *win, *bx, *sp;
38 38
39 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 39 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
40 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 40 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
41 efl_text_set(efl_added, "Efl.Ui.Spin"), 41 efl_text_set(efl_added, "Efl.Ui.Spin"),
42 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 42 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
43 43
diff --git a/src/bin/elementary/test_ui_spin_button.c b/src/bin/elementary/test_ui_spin_button.c
index 0e008203c5..6015d32a60 100644
--- a/src/bin/elementary/test_ui_spin_button.c
+++ b/src/bin/elementary/test_ui_spin_button.c
@@ -28,7 +28,7 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
28 eina_array_push(array, &values[i]); 28 eina_array_push(array, &values[i]);
29 29
30 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 30 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
31 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 31 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
32 efl_text_set(efl_added, "Efl.Ui.Spin_Button"), 32 efl_text_set(efl_added, "Efl.Ui.Spin_Button"),
33 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 33 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
34 34
diff --git a/src/bin/elementary/test_ui_tab_pager.c b/src/bin/elementary/test_ui_tab_pager.c
index af0b900fcf..227963e62e 100644
--- a/src/bin/elementary/test_ui_tab_pager.c
+++ b/src/bin/elementary/test_ui_tab_pager.c
@@ -123,7 +123,7 @@ test_ui_tab_pager(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev
123 int i; 123 int i;
124 124
125 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 125 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
126 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 126 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
127 efl_text_set(efl_added, "Efl.Ui.Tab_Pager"), 127 efl_text_set(efl_added, "Efl.Ui.Tab_Pager"),
128 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 128 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
129 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _win_del_cb, ad)); 129 efl_event_callback_add(efl_added, EFL_EVENT_DEL, _win_del_cb, ad));
diff --git a/src/bin/elementary/test_ui_tags.c b/src/bin/elementary/test_ui_tags.c
index 2c8b3e6fb5..27153e0071 100644
--- a/src/bin/elementary/test_ui_tags.c
+++ b/src/bin/elementary/test_ui_tags.c
@@ -59,7 +59,7 @@ test_ui_tags(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
59 char buf[PATH_MAX]; 59 char buf[PATH_MAX];
60 60
61 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 61 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
62 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 62 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
63 efl_text_set(efl_added, "Efl.Ui.Tags"), 63 efl_text_set(efl_added, "Efl.Ui.Tags"),
64 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 64 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
65 65
diff --git a/src/bin/elementary/test_ui_timepicker.c b/src/bin/elementary/test_ui_timepicker.c
index cb88ef508b..81f1e6f85f 100644
--- a/src/bin/elementary/test_ui_timepicker.c
+++ b/src/bin/elementary/test_ui_timepicker.c
@@ -19,7 +19,7 @@ test_ui_timepicker(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
19 Eo *win, *bx; 19 Eo *win, *bx;
20 20
21 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 21 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
22 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 22 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
23 efl_text_set(efl_added, "Efl.Ui.Timepicker"), 23 efl_text_set(efl_added, "Efl.Ui.Timepicker"),
24 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 24 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
25 25
diff --git a/src/bin/elementary/test_win_dialog.c b/src/bin/elementary/test_win_dialog.c
index 1aaa844c24..bbe82c87f1 100644
--- a/src/bin/elementary/test_win_dialog.c
+++ b/src/bin/elementary/test_win_dialog.c
@@ -29,7 +29,7 @@ _bt2_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
29 Eina_Size2D size = { 300, 150 }; 29 Eina_Size2D size = { 300, 150 };
30 30
31 dia = efl_add(EFL_UI_WIN_CLASS, parent, 31 dia = efl_add(EFL_UI_WIN_CLASS, parent,
32 efl_ui_win_type_set(efl_added, EFL_UI_WIN_DIALOG_BASIC), 32 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_DIALOG_BASIC),
33 efl_ui_win_name_set(efl_added, "window-dia-2"), 33 efl_ui_win_name_set(efl_added, "window-dia-2"),
34 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 34 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
35 efl_text_set(efl_added, "A Fixed Size Dialog")); 35 efl_text_set(efl_added, "A Fixed Size Dialog"));
@@ -76,7 +76,7 @@ _bt3_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
76 Efl_Canvas_Object *dia, *lb, *parent = data; 76 Efl_Canvas_Object *dia, *lb, *parent = data;
77 77
78 dia = efl_add(EFL_UI_WIN_CLASS, parent, 78 dia = efl_add(EFL_UI_WIN_CLASS, parent,
79 efl_ui_win_type_set(efl_added, EFL_UI_WIN_DIALOG_BASIC), 79 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_DIALOG_BASIC),
80 efl_ui_win_name_set(efl_added, "window-dia-3"), 80 efl_ui_win_name_set(efl_added, "window-dia-3"),
81 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 81 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
82 efl_text_set(efl_added, "Min/Max Size Dialog")); 82 efl_text_set(efl_added, "Min/Max Size Dialog"));
@@ -102,7 +102,7 @@ _bt4_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
102 Efl_Canvas_Object *dia, *lb; 102 Efl_Canvas_Object *dia, *lb;
103 103
104 dia = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 104 dia = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
105 efl_ui_win_type_set(efl_added, EFL_UI_WIN_DIALOG_BASIC), 105 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_DIALOG_BASIC),
106 efl_ui_win_name_set(efl_added, "window-dia-4"), 106 efl_ui_win_name_set(efl_added, "window-dia-4"),
107 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 107 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
108 efl_text_set(efl_added, "Min/Max Size Dialog") 108 efl_text_set(efl_added, "Min/Max Size Dialog")
diff --git a/src/bin/elementary/test_win_indicator.c b/src/bin/elementary/test_win_indicator.c
index 1b72b0d311..71922302c1 100644
--- a/src/bin/elementary/test_win_indicator.c
+++ b/src/bin/elementary/test_win_indicator.c
@@ -56,25 +56,25 @@ _create_indicator(void)
56static void 56static void
57_off_clicked(void *data, const Efl_Event *ev EINA_UNUSED) 57_off_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
58{ 58{
59 efl_ui_win_indicator_mode_set(data, EFL_UI_WIN_INDICATOR_OFF); 59 efl_ui_win_indicator_mode_set(data, EFL_UI_WIN_INDICATOR_MODE_OFF);
60} 60}
61 61
62static void 62static void
63_opaque_clicked(void *data, const Efl_Event *ev EINA_UNUSED) 63_opaque_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
64{ 64{
65 efl_ui_win_indicator_mode_set(data, EFL_UI_WIN_INDICATOR_BG_OPAQUE); 65 efl_ui_win_indicator_mode_set(data, EFL_UI_WIN_INDICATOR_MODE_BG_OPAQUE);
66} 66}
67 67
68static void 68static void
69_transparent_clicked(void *data, const Efl_Event *ev EINA_UNUSED) 69_transparent_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
70{ 70{
71 efl_ui_win_indicator_mode_set(data, EFL_UI_WIN_INDICATOR_BG_TRANSPARENT); 71 efl_ui_win_indicator_mode_set(data, EFL_UI_WIN_INDICATOR_MODE_BG_TRANSPARENT);
72} 72}
73 73
74static void 74static void
75_hidden_clicked(void *data, const Efl_Event *ev EINA_UNUSED) 75_hidden_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
76{ 76{
77 efl_ui_win_indicator_mode_set(data, EFL_UI_WIN_INDICATOR_HIDDEN); 77 efl_ui_win_indicator_mode_set(data, EFL_UI_WIN_INDICATOR_MODE_HIDDEN);
78} 78}
79 79
80static void 80static void
@@ -92,7 +92,7 @@ test_win_indicator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
92 92
93 // FIXME: Resizing window should no cause sizing issues! 93 // FIXME: Resizing window should no cause sizing issues!
94 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 94 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
95 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 95 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
96 efl_text_set(efl_added, "Efl.Win.Indicator"), 96 efl_text_set(efl_added, "Efl.Win.Indicator"),
97 efl_gfx_hint_size_max_set(efl_added, EINA_SIZE2D(300, -1)), 97 efl_gfx_hint_size_max_set(efl_added, EINA_SIZE2D(300, -1)),
98 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 98 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
diff --git a/src/bin/elementary/test_win_stack.c b/src/bin/elementary/test_win_stack.c
index d13072d041..85ee109a65 100644
--- a/src/bin/elementary/test_win_stack.c
+++ b/src/bin/elementary/test_win_stack.c
@@ -20,13 +20,13 @@ _win_new(Evas_Object *stack_top, const char *title)
20 if (level >= 3) 20 if (level >= 3)
21 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 21 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
22 efl_ui_win_name_set(efl_added, "window-stack"), 22 efl_ui_win_name_set(efl_added, "window-stack"),
23 efl_ui_win_type_set(efl_added, ELM_WIN_NAVIFRAME_BASIC), 23 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_NAVIFRAME_BASIC),
24 efl_text_set(efl_added, title), 24 efl_text_set(efl_added, title),
25 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 25 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
26 else 26 else
27 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 27 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
28 efl_ui_win_name_set(efl_added, "window-stack"), 28 efl_ui_win_name_set(efl_added, "window-stack"),
29 efl_ui_win_type_set(efl_added, ELM_WIN_DIALOG_BASIC), 29 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_DIALOG_BASIC),
30 efl_text_set(efl_added, title), 30 efl_text_set(efl_added, title),
31 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 31 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
32 32
diff --git a/src/bin/elementary/test_win_state.c b/src/bin/elementary/test_win_state.c
index b4d084e733..f1b9af34cc 100644
--- a/src/bin/elementary/test_win_state.c
+++ b/src/bin/elementary/test_win_state.c
@@ -263,39 +263,39 @@ _bt_pressed(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
263 { 263 {
264 case 1: 264 case 1:
265 printf("Top Left\n"); 265 printf("Top Left\n");
266 res = elm_win_move_resize_start(win, EFL_UI_WIN_MOVE_RESIZE_TOP | EFL_UI_WIN_MOVE_RESIZE_LEFT); 266 res = elm_win_move_resize_start(win, ELM_WIN_MOVE_RESIZE_TOP | ELM_WIN_MOVE_RESIZE_LEFT);
267 break; 267 break;
268 case 2: 268 case 2:
269 printf("Top\n"); 269 printf("Top\n");
270 res = elm_win_move_resize_start(win, EFL_UI_WIN_MOVE_RESIZE_TOP); 270 res = elm_win_move_resize_start(win, ELM_WIN_MOVE_RESIZE_TOP);
271 break; 271 break;
272 case 3: 272 case 3:
273 printf("Top Right\n"); 273 printf("Top Right\n");
274 res = elm_win_move_resize_start(win, EFL_UI_WIN_MOVE_RESIZE_TOP | EFL_UI_WIN_MOVE_RESIZE_RIGHT); 274 res = elm_win_move_resize_start(win, ELM_WIN_MOVE_RESIZE_TOP | ELM_WIN_MOVE_RESIZE_RIGHT);
275 break; 275 break;
276 case 4: 276 case 4:
277 printf("Left\n"); 277 printf("Left\n");
278 res = elm_win_move_resize_start(win, EFL_UI_WIN_MOVE_RESIZE_LEFT); 278 res = elm_win_move_resize_start(win, ELM_WIN_MOVE_RESIZE_LEFT);
279 break; 279 break;
280 case 5: 280 case 5:
281 printf("Move win\n"); 281 printf("Move win\n");
282 res = elm_win_move_resize_start(win, EFL_UI_WIN_MOVE_RESIZE_MOVE); 282 res = elm_win_move_resize_start(win, ELM_WIN_MOVE_RESIZE_MOVE);
283 break; 283 break;
284 case 6: 284 case 6:
285 printf("Right\n"); 285 printf("Right\n");
286 res = elm_win_move_resize_start(win, EFL_UI_WIN_MOVE_RESIZE_RIGHT); 286 res = elm_win_move_resize_start(win, ELM_WIN_MOVE_RESIZE_RIGHT);
287 break; 287 break;
288 case 7: 288 case 7:
289 printf("Bottom Left\n"); 289 printf("Bottom Left\n");
290 res = elm_win_move_resize_start(win, EFL_UI_WIN_MOVE_RESIZE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_LEFT); 290 res = elm_win_move_resize_start(win, ELM_WIN_MOVE_RESIZE_BOTTOM | ELM_WIN_MOVE_RESIZE_LEFT);
291 break; 291 break;
292 case 8: 292 case 8:
293 printf("Bottom\n"); 293 printf("Bottom\n");
294 res = elm_win_move_resize_start(win, EFL_UI_WIN_MOVE_RESIZE_BOTTOM); 294 res = elm_win_move_resize_start(win, ELM_WIN_MOVE_RESIZE_BOTTOM);
295 break; 295 break;
296 case 9: 296 case 9:
297 printf("Bottom Right\n"); 297 printf("Bottom Right\n");
298 res = elm_win_move_resize_start(win, EFL_UI_WIN_MOVE_RESIZE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_RIGHT); 298 res = elm_win_move_resize_start(win, ELM_WIN_MOVE_RESIZE_BOTTOM | ELM_WIN_MOVE_RESIZE_RIGHT);
299 break; 299 break;
300 default: 300 default:
301 printf("No action\n"); 301 printf("No action\n");
diff --git a/src/examples/elementary/efl_canvas_layout_text.c b/src/examples/elementary/efl_canvas_layout_text.c
index 91eff503e0..bb4dc0f379 100644
--- a/src/examples/elementary/efl_canvas_layout_text.c
+++ b/src/examples/elementary/efl_canvas_layout_text.c
@@ -121,7 +121,7 @@ efl_main(void *data EINA_UNUSED,
121 Eo *win; 121 Eo *win;
122 122
123 win = efl_add(EFL_UI_WIN_CLASS, NULL, 123 win = efl_add(EFL_UI_WIN_CLASS, NULL,
124 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 124 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
125 efl_text_set(efl_added, "Efl Canvas_Layout"), 125 efl_text_set(efl_added, "Efl Canvas_Layout"),
126 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 126 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
127 efl_event_callback_add(efl_added, EFL_UI_WIN_EVENT_DELETE_REQUEST, _on_win_delete, NULL)); 127 efl_event_callback_add(efl_added, EFL_UI_WIN_EVENT_DELETE_REQUEST, _on_win_delete, NULL));
diff --git a/src/examples/elementary/efl_ui_grid_example_1.c b/src/examples/elementary/efl_ui_grid_example_1.c
index b2960bb04b..43ea195e14 100644
--- a/src/examples/elementary/efl_ui_grid_example_1.c
+++ b/src/examples/elementary/efl_ui_grid_example_1.c
@@ -39,7 +39,7 @@ elm_main(int argc, char **argv)
39 Grid_Event_Data *gd = calloc(sizeof(Grid_Event_Data *), 1); 39 Grid_Event_Data *gd = calloc(sizeof(Grid_Event_Data *), 1);
40 40
41 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 41 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
42 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 42 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
43 efl_text_set(efl_added, "Efl.Ui.Grid"), 43 efl_text_set(efl_added, "Efl.Ui.Grid"),
44 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 44 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
45 45
diff --git a/src/examples/elementary/efl_ui_relative_layout_example_01.c b/src/examples/elementary/efl_ui_relative_layout_example_01.c
index 36ebd3f545..731eeb9d08 100644
--- a/src/examples/elementary/efl_ui_relative_layout_example_01.c
+++ b/src/examples/elementary/efl_ui_relative_layout_example_01.c
@@ -16,7 +16,7 @@ elm_main(int argc, char **argv)
16 Eo *win, *layout, *btn1, *btn2, *btn3; 16 Eo *win, *layout, *btn1, *btn2, *btn3;
17 17
18 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 18 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
19 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 19 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
20 efl_text_set(efl_added, "Efl.Ui.Relative_Layout"), 20 efl_text_set(efl_added, "Efl.Ui.Relative_Layout"),
21 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 21 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
22 22
diff --git a/src/examples/elementary/efl_ui_relative_layout_example_02.c b/src/examples/elementary/efl_ui_relative_layout_example_02.c
index db21b15aba..a32da8d44e 100644
--- a/src/examples/elementary/efl_ui_relative_layout_example_02.c
+++ b/src/examples/elementary/efl_ui_relative_layout_example_02.c
@@ -16,7 +16,7 @@ elm_main(int argc, char **argv)
16 Eo *win, *layout, *btn1, *btn2; 16 Eo *win, *layout, *btn1, *btn2;
17 17
18 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 18 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
19 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 19 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
20 efl_text_set(efl_added, "Efl.Ui.Relative_Layout"), 20 efl_text_set(efl_added, "Efl.Ui.Relative_Layout"),
21 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 21 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
22 22
diff --git a/src/examples/elementary/efl_ui_theme_example_01.c b/src/examples/elementary/efl_ui_theme_example_01.c
index 601dd5c8af..3eda0342c0 100644
--- a/src/examples/elementary/efl_ui_theme_example_01.c
+++ b/src/examples/elementary/efl_ui_theme_example_01.c
@@ -52,7 +52,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
52 efl_ui_theme_extension_add(default_theme, EXAMPLE_EDJ_FILE_PATH); 52 efl_ui_theme_extension_add(default_theme, EXAMPLE_EDJ_FILE_PATH);
53 53
54 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 54 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
55 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 55 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
56 efl_text_set(efl_added, "Efl.Ui.Theme example"), 56 efl_text_set(efl_added, "Efl.Ui.Theme example"),
57 efl_ui_win_autodel_set(efl_added, EINA_TRUE) 57 efl_ui_win_autodel_set(efl_added, EINA_TRUE)
58 ); 58 );
diff --git a/src/examples/elementary/efl_ui_theme_example_02.c b/src/examples/elementary/efl_ui_theme_example_02.c
index a8c81de1dc..4bc76d7203 100644
--- a/src/examples/elementary/efl_ui_theme_example_02.c
+++ b/src/examples/elementary/efl_ui_theme_example_02.c
@@ -52,7 +52,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
52 efl_ui_theme_overlay_add(default_theme, EXAMPLE_EDJ_FILE_PATH); 52 efl_ui_theme_overlay_add(default_theme, EXAMPLE_EDJ_FILE_PATH);
53 53
54 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 54 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
55 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 55 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
56 efl_text_set(efl_added, "Efl.Ui.Theme example"), 56 efl_text_set(efl_added, "Efl.Ui.Theme example"),
57 efl_ui_win_autodel_set(efl_added, EINA_TRUE) 57 efl_ui_win_autodel_set(efl_added, EINA_TRUE)
58 ); 58 );
diff --git a/src/examples/elementary/toolbar_cxx_example_01.cc b/src/examples/elementary/toolbar_cxx_example_01.cc
index f5c47cb0eb..c4bab13db8 100644
--- a/src/examples/elementary/toolbar_cxx_example_01.cc
+++ b/src/examples/elementary/toolbar_cxx_example_01.cc
@@ -22,7 +22,7 @@ elm_main(int argc, char* argv[])
22 { 22 {
23 win_1.text_set("Toolbar"); 23 win_1.text_set("Toolbar");
24 win_1.win_name_set("toolbar"); 24 win_1.win_name_set("toolbar");
25 win_1.win_type_set(EFL_UI_WIN_BASIC); 25 win_1.win_type_set(EFL_UI_WIN_TYPE_BASIC);
26 }); 26 });
27 27
28#if 0 28#if 0
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index e5ebbd2dcd..f29365d485 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -53,7 +53,7 @@ static int _paused_windows = 0;
53#define TRAP(sd, name, ...) \ 53#define TRAP(sd, name, ...) \
54 do \ 54 do \
55 { \ 55 { \
56 if (sd->type != ELM_WIN_FAKE) \ 56 if (sd->type != EFL_UI_WIN_TYPE_FAKE) \
57 if ((!trap) || (!trap->name) || \ 57 if ((!trap) || (!trap->name) || \
58 ((trap->name) && \ 58 ((trap->name) && \
59 (trap->name(sd->trap_data, sd->obj, ## __VA_ARGS__)))) \ 59 (trap->name(sd->trap_data, sd->obj, ## __VA_ARGS__)))) \
@@ -385,6 +385,66 @@ static inline void _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const char *e
385static void _elm_win_resize_objects_eval(Evas_Object *obj, Eina_Bool force_resize); 385static void _elm_win_resize_objects_eval(Evas_Object *obj, Eina_Bool force_resize);
386static void _elm_win_frame_obj_update(Efl_Ui_Win_Data *sd, Eina_Bool force); 386static void _elm_win_frame_obj_update(Efl_Ui_Win_Data *sd, Eina_Bool force);
387 387
388static inline Efl_Ui_Win_Type
389_elm_win_type_to_efl_ui_win_type(Elm_Win_Type type)
390{
391 switch (type)
392 {
393#define CONVERT_TYPE(TYPE) case ELM_WIN_##TYPE: return EFL_UI_WIN_TYPE_##TYPE
394 CONVERT_TYPE(BASIC);
395 CONVERT_TYPE(DIALOG_BASIC);
396 CONVERT_TYPE(DESKTOP);
397 CONVERT_TYPE(DOCK);
398 CONVERT_TYPE(TOOLBAR);
399 CONVERT_TYPE(MENU);
400 CONVERT_TYPE(UTILITY);
401 CONVERT_TYPE(SPLASH);
402 CONVERT_TYPE(DROPDOWN_MENU);
403 CONVERT_TYPE(POPUP_MENU);
404 CONVERT_TYPE(TOOLTIP);
405 CONVERT_TYPE(NOTIFICATION);
406 CONVERT_TYPE(COMBO);
407 CONVERT_TYPE(DND);
408 CONVERT_TYPE(INLINED_IMAGE);
409 CONVERT_TYPE(SOCKET_IMAGE);
410 CONVERT_TYPE(FAKE);
411 CONVERT_TYPE(NAVIFRAME_BASIC);
412 default: break;
413 }
414 return EFL_UI_WIN_TYPE_UNKNOWN;
415#undef CONVERT_TYPE
416}
417
418static inline Elm_Win_Type
419_efl_ui_win_type_to_elm_win_type(Efl_Ui_Win_Type type)
420{
421 switch (type)
422 {
423#define CONVERT_TYPE(TYPE) case EFL_UI_WIN_TYPE_##TYPE: return ELM_WIN_##TYPE
424 CONVERT_TYPE(BASIC);
425 CONVERT_TYPE(DIALOG_BASIC);
426 CONVERT_TYPE(DESKTOP);
427 CONVERT_TYPE(DOCK);
428 CONVERT_TYPE(TOOLBAR);
429 CONVERT_TYPE(MENU);
430 CONVERT_TYPE(UTILITY);
431 CONVERT_TYPE(SPLASH);
432 CONVERT_TYPE(DROPDOWN_MENU);
433 CONVERT_TYPE(POPUP_MENU);
434 CONVERT_TYPE(TOOLTIP);
435 CONVERT_TYPE(NOTIFICATION);
436 CONVERT_TYPE(COMBO);
437 CONVERT_TYPE(DND);
438 CONVERT_TYPE(INLINED_IMAGE);
439 CONVERT_TYPE(SOCKET_IMAGE);
440 CONVERT_TYPE(FAKE);
441 CONVERT_TYPE(NAVIFRAME_BASIC);
442 default: break;
443 }
444 return ELM_WIN_UNKNOWN;
445#undef CONVERT_TYPE
446}
447
388#ifdef HAVE_ELEMENTARY_X 448#ifdef HAVE_ELEMENTARY_X
389static void _elm_win_xwin_update(Efl_Ui_Win_Data *sd); 449static void _elm_win_xwin_update(Efl_Ui_Win_Data *sd);
390#endif 450#endif
@@ -1000,7 +1060,7 @@ _elm_win_pre_render(Ecore_Evas *ee)
1000 { 1060 {
1001 int mw, mh; 1061 int mw, mh;
1002 1062
1003 if (sd->type != ELM_WIN_FAKE) 1063 if (sd->type != EFL_UI_WIN_TYPE_FAKE)
1004 { 1064 {
1005 edje_object_thaw(sd->frame_obj); 1065 edje_object_thaw(sd->frame_obj);
1006 evas_object_show(sd->frame_obj); 1066 evas_object_show(sd->frame_obj);
@@ -1315,7 +1375,7 @@ _elm_win_focus_in(Ecore_Evas *ee)
1315 1375
1316 _elm_widget_top_win_focused_set(obj, EINA_TRUE); 1376 _elm_widget_top_win_focused_set(obj, EINA_TRUE);
1317 ELM_WIN_DATA_ALIVE_CHECK(obj, sd); 1377 ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
1318 if (sd->type != ELM_WIN_FAKE) 1378 if (sd->type != EFL_UI_WIN_TYPE_FAKE)
1319 { 1379 {
1320 Efl_Ui_Focus_Manager *man = sd->obj; 1380 Efl_Ui_Focus_Manager *man = sd->obj;
1321 while(efl_ui_focus_manager_redirect_get(man)) 1381 while(efl_ui_focus_manager_redirect_get(man))
@@ -1388,7 +1448,7 @@ _elm_win_focus_out(Ecore_Evas *ee)
1388 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_ACTIVE, EINA_FALSE); 1448 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_ACTIVE, EINA_FALSE);
1389 } 1449 }
1390 1450
1391 if (sd->type != ELM_WIN_FAKE) 1451 if (sd->type != EFL_UI_WIN_TYPE_FAKE)
1392 { 1452 {
1393 Efl_Ui_Focus_Manager *man = sd->obj; 1453 Efl_Ui_Focus_Manager *man = sd->obj;
1394 while(efl_ui_focus_manager_redirect_get(man)) 1454 while(efl_ui_focus_manager_redirect_get(man))
@@ -2943,7 +3003,7 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd)
2943 3003
2944 /* NB: child deletion handled by parent's smart del */ 3004 /* NB: child deletion handled by parent's smart del */
2945 3005
2946 if ((sd->type != ELM_WIN_FAKE) && (trap) && (trap->del)) 3006 if ((sd->type != EFL_UI_WIN_TYPE_FAKE) && (trap) && (trap->del))
2947 trap->del(sd->trap_data, obj); 3007 trap->del(sd->trap_data, obj);
2948 3008
2949 if (sd->parent) 3009 if (sd->parent)
@@ -2995,7 +3055,7 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd)
2995 } 3055 }
2996 else 3056 else
2997 { 3057 {
2998 if (sd->ee && (sd->type != ELM_WIN_FAKE)) 3058 if (sd->ee && (sd->type != EFL_UI_WIN_TYPE_FAKE))
2999 { 3059 {
3000 ecore_evas_manual_render_set(sd->ee, EINA_TRUE); 3060 ecore_evas_manual_render_set(sd->ee, EINA_TRUE);
3001 edje_object_freeze(sd->frame_obj); 3061 edje_object_freeze(sd->frame_obj);
@@ -3409,7 +3469,7 @@ _elm_win_xwin_update(Efl_Ui_Win_Data *sd)
3409{ 3469{
3410 const char *s; 3470 const char *s;
3411 3471
3412 if (sd->type == ELM_WIN_FAKE) return; 3472 if (sd->type == EFL_UI_WIN_TYPE_FAKE) return;
3413 _internal_elm_win_xwindow_get(sd); 3473 _internal_elm_win_xwindow_get(sd);
3414 3474
3415 if (!sd->x.xwin) return; /* nothing more to do */ 3475 if (!sd->x.xwin) return; /* nothing more to do */
@@ -4031,40 +4091,40 @@ typedef struct _resize_info {
4031} resize_info; 4091} resize_info;
4032 4092
4033static const resize_info _resize_infos_legacy[8] = { 4093static const resize_info _resize_infos_legacy[8] = {
4034 { "elm.event.resize.t", ELM_CURSOR_TOP_SIDE, EFL_UI_WIN_MOVE_RESIZE_TOP, 1 XDIR(SIZE_T) }, 4094 { "elm.event.resize.t", ELM_CURSOR_TOP_SIDE, EFL_UI_WIN_MOVE_RESIZE_MODE_TOP, 1 XDIR(SIZE_T) },
4035 { "elm.event.resize.b", ELM_CURSOR_BOTTOM_SIDE, EFL_UI_WIN_MOVE_RESIZE_BOTTOM, 2 XDIR(SIZE_B) }, 4095 { "elm.event.resize.b", ELM_CURSOR_BOTTOM_SIDE, EFL_UI_WIN_MOVE_RESIZE_MODE_BOTTOM, 2 XDIR(SIZE_B) },
4036 { "elm.event.resize.l", ELM_CURSOR_LEFT_SIDE, EFL_UI_WIN_MOVE_RESIZE_LEFT, 4 XDIR(SIZE_L) }, 4096 { "elm.event.resize.l", ELM_CURSOR_LEFT_SIDE, EFL_UI_WIN_MOVE_RESIZE_MODE_LEFT, 4 XDIR(SIZE_L) },
4037 { "elm.event.resize.r", ELM_CURSOR_RIGHT_SIDE, EFL_UI_WIN_MOVE_RESIZE_RIGHT, 8 XDIR(SIZE_R) }, 4097 { "elm.event.resize.r", ELM_CURSOR_RIGHT_SIDE, EFL_UI_WIN_MOVE_RESIZE_MODE_RIGHT, 8 XDIR(SIZE_R) },
4038 { "elm.event.resize.tl", ELM_CURSOR_TOP_LEFT_CORNER, EFL_UI_WIN_MOVE_RESIZE_TOP | EFL_UI_WIN_MOVE_RESIZE_LEFT, 5 XDIR(SIZE_TL) }, 4098 { "elm.event.resize.tl", ELM_CURSOR_TOP_LEFT_CORNER, EFL_UI_WIN_MOVE_RESIZE_MODE_TOP | EFL_UI_WIN_MOVE_RESIZE_MODE_LEFT, 5 XDIR(SIZE_TL) },
4039 { "elm.event.resize.bl", ELM_CURSOR_BOTTOM_LEFT_CORNER, EFL_UI_WIN_MOVE_RESIZE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_LEFT, 6 XDIR(SIZE_BL) }, 4099 { "elm.event.resize.bl", ELM_CURSOR_BOTTOM_LEFT_CORNER, EFL_UI_WIN_MOVE_RESIZE_MODE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_MODE_LEFT, 6 XDIR(SIZE_BL) },
4040 { "elm.event.resize.br", ELM_CURSOR_BOTTOM_RIGHT_CORNER, EFL_UI_WIN_MOVE_RESIZE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_RIGHT, 10 XDIR(SIZE_BR) }, 4100 { "elm.event.resize.br", ELM_CURSOR_BOTTOM_RIGHT_CORNER, EFL_UI_WIN_MOVE_RESIZE_MODE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_MODE_RIGHT, 10 XDIR(SIZE_BR) },
4041 { "elm.event.resize.tr", ELM_CURSOR_TOP_RIGHT_CORNER, EFL_UI_WIN_MOVE_RESIZE_TOP | EFL_UI_WIN_MOVE_RESIZE_RIGHT, 9 XDIR(SIZE_TR) }, 4101 { "elm.event.resize.tr", ELM_CURSOR_TOP_RIGHT_CORNER, EFL_UI_WIN_MOVE_RESIZE_MODE_TOP | EFL_UI_WIN_MOVE_RESIZE_MODE_RIGHT, 9 XDIR(SIZE_TR) },
4042}; 4102};
4043 4103
4044static const resize_info _resize_infos[8] = { 4104static const resize_info _resize_infos[8] = {
4045 { "efl.event.resize.t", ELM_CURSOR_TOP_SIDE, EFL_UI_WIN_MOVE_RESIZE_TOP, 1 XDIR(SIZE_T) }, 4105 { "efl.event.resize.t", ELM_CURSOR_TOP_SIDE, EFL_UI_WIN_MOVE_RESIZE_MODE_TOP, 1 XDIR(SIZE_T) },
4046 { "efl.event.resize.b", ELM_CURSOR_BOTTOM_SIDE, EFL_UI_WIN_MOVE_RESIZE_BOTTOM, 2 XDIR(SIZE_B) }, 4106 { "efl.event.resize.b", ELM_CURSOR_BOTTOM_SIDE, EFL_UI_WIN_MOVE_RESIZE_MODE_BOTTOM, 2 XDIR(SIZE_B) },
4047 { "efl.event.resize.l", ELM_CURSOR_LEFT_SIDE, EFL_UI_WIN_MOVE_RESIZE_LEFT, 4 XDIR(SIZE_L) }, 4107 { "efl.event.resize.l", ELM_CURSOR_LEFT_SIDE, EFL_UI_WIN_MOVE_RESIZE_MODE_LEFT, 4 XDIR(SIZE_L) },
4048 { "efl.event.resize.r", ELM_CURSOR_RIGHT_SIDE, EFL_UI_WIN_MOVE_RESIZE_RIGHT, 8 XDIR(SIZE_R) }, 4108 { "efl.event.resize.r", ELM_CURSOR_RIGHT_SIDE, EFL_UI_WIN_MOVE_RESIZE_MODE_RIGHT, 8 XDIR(SIZE_R) },
4049 { "efl.event.resize.tl", ELM_CURSOR_TOP_LEFT_CORNER, EFL_UI_WIN_MOVE_RESIZE_TOP | EFL_UI_WIN_MOVE_RESIZE_LEFT, 5 XDIR(SIZE_TL) }, 4109 { "efl.event.resize.tl", ELM_CURSOR_TOP_LEFT_CORNER, EFL_UI_WIN_MOVE_RESIZE_MODE_TOP | EFL_UI_WIN_MOVE_RESIZE_MODE_LEFT, 5 XDIR(SIZE_TL) },
4050 { "efl.event.resize.bl", ELM_CURSOR_BOTTOM_LEFT_CORNER, EFL_UI_WIN_MOVE_RESIZE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_LEFT, 6 XDIR(SIZE_BL) }, 4110 { "efl.event.resize.bl", ELM_CURSOR_BOTTOM_LEFT_CORNER, EFL_UI_WIN_MOVE_RESIZE_MODE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_MODE_LEFT, 6 XDIR(SIZE_BL) },
4051 { "efl.event.resize.br", ELM_CURSOR_BOTTOM_RIGHT_CORNER, EFL_UI_WIN_MOVE_RESIZE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_RIGHT, 10 XDIR(SIZE_BR) }, 4111 { "efl.event.resize.br", ELM_CURSOR_BOTTOM_RIGHT_CORNER, EFL_UI_WIN_MOVE_RESIZE_MODE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_MODE_RIGHT, 10 XDIR(SIZE_BR) },
4052 { "efl.event.resize.tr", ELM_CURSOR_TOP_RIGHT_CORNER, EFL_UI_WIN_MOVE_RESIZE_TOP | EFL_UI_WIN_MOVE_RESIZE_RIGHT, 9 XDIR(SIZE_TR) }, 4112 { "efl.event.resize.tr", ELM_CURSOR_TOP_RIGHT_CORNER, EFL_UI_WIN_MOVE_RESIZE_MODE_TOP | EFL_UI_WIN_MOVE_RESIZE_MODE_RIGHT, 9 XDIR(SIZE_TR) },
4053}; 4113};
4054 4114
4055static inline Efl_Ui_Win_Move_Resize_Mode 4115static inline Efl_Ui_Win_Move_Resize_Mode
4056_move_resize_mode_rotate(int rotation, Efl_Ui_Win_Move_Resize_Mode mode) 4116_move_resize_mode_rotate(int rotation, Efl_Ui_Win_Move_Resize_Mode mode)
4057{ 4117{
4058 const Efl_Ui_Win_Move_Resize_Mode edges[4] = { 4118 const Efl_Ui_Win_Move_Resize_Mode edges[4] = {
4059 EFL_UI_WIN_MOVE_RESIZE_TOP, EFL_UI_WIN_MOVE_RESIZE_LEFT, 4119 EFL_UI_WIN_MOVE_RESIZE_MODE_TOP, EFL_UI_WIN_MOVE_RESIZE_MODE_LEFT,
4060 EFL_UI_WIN_MOVE_RESIZE_BOTTOM, EFL_UI_WIN_MOVE_RESIZE_RIGHT 4120 EFL_UI_WIN_MOVE_RESIZE_MODE_BOTTOM, EFL_UI_WIN_MOVE_RESIZE_MODE_RIGHT
4061 }; 4121 };
4062 4122
4063 const Efl_Ui_Win_Move_Resize_Mode corners[4] = { 4123 const Efl_Ui_Win_Move_Resize_Mode corners[4] = {
4064 EFL_UI_WIN_MOVE_RESIZE_TOP | EFL_UI_WIN_MOVE_RESIZE_LEFT, 4124 EFL_UI_WIN_MOVE_RESIZE_MODE_TOP | EFL_UI_WIN_MOVE_RESIZE_MODE_LEFT,
4065 EFL_UI_WIN_MOVE_RESIZE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_LEFT, 4125 EFL_UI_WIN_MOVE_RESIZE_MODE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_MODE_LEFT,
4066 EFL_UI_WIN_MOVE_RESIZE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_RIGHT, 4126 EFL_UI_WIN_MOVE_RESIZE_MODE_BOTTOM | EFL_UI_WIN_MOVE_RESIZE_MODE_RIGHT,
4067 EFL_UI_WIN_MOVE_RESIZE_TOP | EFL_UI_WIN_MOVE_RESIZE_RIGHT, 4127 EFL_UI_WIN_MOVE_RESIZE_MODE_TOP | EFL_UI_WIN_MOVE_RESIZE_MODE_RIGHT,
4068 }; 4128 };
4069 4129
4070 const int i = rotation / 90; 4130 const int i = rotation / 90;
@@ -4078,7 +4138,7 @@ _move_resize_mode_rotate(int rotation, Efl_Ui_Win_Move_Resize_Mode mode)
4078 if (mode == corners[k]) 4138 if (mode == corners[k])
4079 return corners[(k + i) % 4]; 4139 return corners[(k + i) % 4];
4080 4140
4081 return EFL_UI_WIN_MOVE_RESIZE_MOVE; 4141 return EFL_UI_WIN_MOVE_RESIZE_MODE_MOVE;
4082} 4142}
4083 4143
4084static const resize_info * 4144static const resize_info *
@@ -4123,7 +4183,7 @@ _move_resize_mode_get(Evas_Object *obj, const char *source)
4123 return _resize_infos[k].mode; 4183 return _resize_infos[k].mode;
4124 } 4184 }
4125 4185
4126 return EFL_UI_WIN_MOVE_RESIZE_MOVE; 4186 return EFL_UI_WIN_MOVE_RESIZE_MODE_MOVE;
4127} 4187}
4128 4188
4129static void 4189static void
@@ -4264,7 +4324,7 @@ _win_move_resize_start(Efl_Ui_Win_Data *sd, Efl_Ui_Win_Move_Resize_Mode mode)
4264 return EINA_FALSE; 4324 return EINA_FALSE;
4265 } 4325 }
4266 4326
4267 if (mode == EFL_UI_WIN_MOVE_RESIZE_MOVE) 4327 if (mode == EFL_UI_WIN_MOVE_RESIZE_MODE_MOVE)
4268 return _win_move_start(sd); 4328 return _win_move_start(sd);
4269 4329
4270 ri = _resize_info_get(sd->obj, sd->rot, mode); 4330 ri = _resize_info_get(sd->obj, sd->rot, mode);
@@ -4310,7 +4370,7 @@ _elm_win_frame_cb_move_start(void *data,
4310{ 4370{
4311 ELM_WIN_DATA_GET_OR_RETURN(data, sd); 4371 ELM_WIN_DATA_GET_OR_RETURN(data, sd);
4312 4372
4313 _win_move_resize_start(sd, EFL_UI_WIN_MOVE_RESIZE_MOVE); 4373 _win_move_resize_start(sd, EFL_UI_WIN_MOVE_RESIZE_MODE_MOVE);
4314} 4374}
4315 4375
4316static void 4376static void
@@ -4321,7 +4381,7 @@ _elm_win_frame_cb_resize_start(void *data, Evas_Object *obj EINA_UNUSED,
4321 Efl_Ui_Win_Move_Resize_Mode mode; 4381 Efl_Ui_Win_Move_Resize_Mode mode;
4322 4382
4323 mode = _move_resize_mode_get(sd->obj, source); 4383 mode = _move_resize_mode_get(sd->obj, source);
4324 if (mode == EFL_UI_WIN_MOVE_RESIZE_MOVE) return; 4384 if (mode == EFL_UI_WIN_MOVE_RESIZE_MODE_MOVE) return;
4325 4385
4326 _win_move_resize_start(sd, mode); 4386 _win_move_resize_start(sd, mode);
4327} 4387}
@@ -4697,7 +4757,7 @@ _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool
4697 if (!sd->frame_obj) 4757 if (!sd->frame_obj)
4698 { 4758 {
4699 if (!efl_finalized_get(sd->obj)) return; 4759 if (!efl_finalized_get(sd->obj)) return;
4700 if (EINA_LIKELY(sd->type == ELM_WIN_FAKE)) 4760 if (EINA_LIKELY(sd->type == EFL_UI_WIN_TYPE_FAKE))
4701 return; 4761 return;
4702 if (!_elm_config->win_no_border) 4762 if (!_elm_config->win_no_border)
4703 CRI("Window has no frame object!"); 4763 CRI("Window has no frame object!");
@@ -4927,7 +4987,7 @@ _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const char *engine)
4927 sd->csd.wayland = (eina_streq(engine, ELM_WAYLAND_SHM) || 4987 sd->csd.wayland = (eina_streq(engine, ELM_WAYLAND_SHM) ||
4928 eina_streq(engine, ELM_WAYLAND_EGL)); 4988 eina_streq(engine, ELM_WAYLAND_EGL));
4929 4989
4930 if (sd->type == ELM_WIN_FAKE) 4990 if (sd->type == EFL_UI_WIN_TYPE_FAKE)
4931 sd->csd.need = EINA_FALSE; 4991 sd->csd.need = EINA_FALSE;
4932 else if (eina_streq(s, "on")) 4992 else if (eina_streq(s, "on"))
4933 sd->csd.need = EINA_TRUE; 4993 sd->csd.need = EINA_TRUE;
@@ -5081,7 +5141,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
5081 5141
5082 switch ((int) type) 5142 switch ((int) type)
5083 { 5143 {
5084 case ELM_WIN_FAKE: 5144 case EFL_UI_WIN_TYPE_FAKE:
5085 tmp_sd.ee = sd->ee; 5145 tmp_sd.ee = sd->ee;
5086 break; 5146 break;
5087 case ELM_WIN_INLINED_IMAGE: 5147 case ELM_WIN_INLINED_IMAGE:
@@ -5431,12 +5491,12 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
5431 SD_CPY(shot.info); 5491 SD_CPY(shot.info);
5432#undef SD_CPY 5492#undef SD_CPY
5433 5493
5434 if ((type != ELM_WIN_FAKE) && (trap) && (trap->add)) 5494 if ((type != EFL_UI_WIN_TYPE_FAKE) && (trap) && (trap->add))
5435 sd->trap_data = trap->add(obj); 5495 sd->trap_data = trap->add(obj);
5436 5496
5437 /* complementary actions, which depend on final smart data 5497 /* complementary actions, which depend on final smart data
5438 * pointer */ 5498 * pointer */
5439 if (type == ELM_WIN_INLINED_IMAGE) 5499 if (type == EFL_UI_WIN_TYPE_INLINED_IMAGE)
5440 _win_inlined_image_set(sd); 5500 _win_inlined_image_set(sd);
5441#ifdef HAVE_ELEMENTARY_X 5501#ifdef HAVE_ELEMENTARY_X
5442 else if ((engine) && 5502 else if ((engine) &&
@@ -5454,7 +5514,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
5454 5514
5455 sd->kbdmode = ELM_WIN_KEYBOARD_UNKNOWN; 5515 sd->kbdmode = ELM_WIN_KEYBOARD_UNKNOWN;
5456 sd->legacy.indmode = ELM_WIN_INDICATOR_UNKNOWN; 5516 sd->legacy.indmode = ELM_WIN_INDICATOR_UNKNOWN;
5457 sd->indimode = EFL_UI_WIN_INDICATOR_OFF; 5517 sd->indimode = EFL_UI_WIN_INDICATOR_MODE_OFF;
5458 5518
5459#ifdef HAVE_ELEMENTARY_X 5519#ifdef HAVE_ELEMENTARY_X
5460 _internal_elm_win_xwindow_get(sd); 5520 _internal_elm_win_xwindow_get(sd);
@@ -5494,7 +5554,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
5494 } 5554 }
5495 ecore_wl2_window_type_set(sd->wl.win, wtype); 5555 ecore_wl2_window_type_set(sd->wl.win, wtype);
5496 } 5556 }
5497 else if (sd->type == ELM_WIN_FAKE) 5557 else if (sd->type == EFL_UI_WIN_TYPE_FAKE)
5498 { 5558 {
5499 const char *env = getenv("WAYLAND_DISPLAY"); 5559 const char *env = getenv("WAYLAND_DISPLAY");
5500 if (env) 5560 if (env)
@@ -5540,13 +5600,13 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
5540 evas_object_color_set(obj, 0, 0, 0, 0); 5600 evas_object_color_set(obj, 0, 0, 0, 0);
5541 evas_object_pass_events_set(obj, EINA_TRUE); 5601 evas_object_pass_events_set(obj, EINA_TRUE);
5542 5602
5543 if (type == ELM_WIN_INLINED_IMAGE) 5603 if (type == EFL_UI_WIN_TYPE_INLINED_IMAGE)
5544 efl_ui_win_inlined_parent_set(obj, parent); 5604 efl_ui_win_inlined_parent_set(obj, parent);
5545 5605
5546 /* use own version of ecore_evas_object_associate() that does TRAP() */ 5606 /* use own version of ecore_evas_object_associate() that does TRAP() */
5547 ecore_evas_data_set(sd->ee, "elm_win", obj); 5607 ecore_evas_data_set(sd->ee, "elm_win", obj);
5548 5608
5549 if (type != ELM_WIN_FAKE) 5609 if (type != EFL_UI_WIN_TYPE_FAKE)
5550 { 5610 {
5551 evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 5611 evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
5552 _elm_win_obj_callback_changed_size_hints, NULL); 5612 _elm_win_obj_callback_changed_size_hints, NULL);
@@ -5571,7 +5631,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
5571 ecore_evas_callback_resize_set(sd->ee, _elm_win_resize); 5631 ecore_evas_callback_resize_set(sd->ee, _elm_win_resize);
5572 ecore_evas_callback_move_set(sd->ee, _elm_win_move); 5632 ecore_evas_callback_move_set(sd->ee, _elm_win_move);
5573 ecore_evas_callback_pre_render_set(sd->ee, _elm_win_pre_render); 5633 ecore_evas_callback_pre_render_set(sd->ee, _elm_win_pre_render);
5574 if (type != ELM_WIN_FAKE) 5634 if (type != EFL_UI_WIN_TYPE_FAKE)
5575 { 5635 {
5576 ecore_evas_callback_mouse_in_set(sd->ee, _elm_win_mouse_in); 5636 ecore_evas_callback_mouse_in_set(sd->ee, _elm_win_mouse_in);
5577 ecore_evas_callback_mouse_out_set(sd->ee, _elm_win_mouse_out); 5637 ecore_evas_callback_mouse_out_set(sd->ee, _elm_win_mouse_out);
@@ -5600,7 +5660,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
5600 _elm_win_xwin_update(sd); 5660 _elm_win_xwin_update(sd);
5601#endif 5661#endif
5602 5662
5603 if (type != ELM_WIN_FAKE) 5663 if (type != EFL_UI_WIN_TYPE_FAKE)
5604 { 5664 {
5605 //Prohibiting auto-rendering, until elm_win is shown. 5665 //Prohibiting auto-rendering, until elm_win is shown.
5606 if (_elm_win_auto_norender_withdrawn(obj)) 5666 if (_elm_win_auto_norender_withdrawn(obj))
@@ -5627,7 +5687,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
5627 ERR("failed to grab F12 key to elm widgets (dot) tree generation"); 5687 ERR("failed to grab F12 key to elm widgets (dot) tree generation");
5628#endif 5688#endif
5629 5689
5630 if (type != ELM_WIN_FAKE) 5690 if (type != EFL_UI_WIN_TYPE_FAKE)
5631 { 5691 {
5632 if ((_elm_config->softcursor_mode == ELM_SOFTCURSOR_MODE_ON) || 5692 if ((_elm_config->softcursor_mode == ELM_SOFTCURSOR_MODE_ON) ||
5633 ((_elm_config->softcursor_mode == ELM_SOFTCURSOR_MODE_AUTO) && 5693 ((_elm_config->softcursor_mode == ELM_SOFTCURSOR_MODE_AUTO) &&
@@ -5665,7 +5725,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
5665 _elm_win_apply_alpha(obj, sd); 5725 _elm_win_apply_alpha(obj, sd);
5666 5726
5667#ifdef HAVE_ELEMENTARY_WL2 5727#ifdef HAVE_ELEMENTARY_WL2
5668 if ((type != ELM_WIN_FAKE) && (type != ELM_WIN_INLINED_IMAGE)) 5728 if ((type != EFL_UI_WIN_TYPE_FAKE) && (type != EFL_UI_WIN_TYPE_INLINED_IMAGE))
5669 { 5729 {
5670 if ((engine) && 5730 if ((engine) &&
5671 ((!strcmp(engine, ELM_WAYLAND_SHM) || 5731 ((!strcmp(engine, ELM_WAYLAND_SHM) ||
@@ -5693,7 +5753,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
5693#endif 5753#endif
5694 5754
5695 /* do not append to list; all windows render as black rects */ 5755 /* do not append to list; all windows render as black rects */
5696 if (type != ELM_WIN_FAKE) 5756 if (type != EFL_UI_WIN_TYPE_FAKE)
5697 { 5757 {
5698 const char *element = "base"; 5758 const char *element = "base";
5699 const char *style; 5759 const char *style;
@@ -5711,15 +5771,15 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
5711 if (!style) style = "default"; 5771 if (!style) style = "default";
5712 switch (type) 5772 switch (type)
5713 { 5773 {
5714 case EFL_UI_WIN_DIALOG_BASIC: element = "dialog"; break; 5774 case EFL_UI_WIN_TYPE_DIALOG_BASIC: element = "dialog"; break;
5715 case EFL_UI_WIN_NAVIFRAME_BASIC: element = "naviframe"; break; 5775 case EFL_UI_WIN_TYPE_NAVIFRAME_BASIC: element = "naviframe"; break;
5716 default: break; 5776 default: break;
5717 } 5777 }
5718 5778
5719 if (!_elm_config->win_no_border) 5779 if (!_elm_config->win_no_border)
5720 _elm_win_frame_add(sd, element, style); 5780 _elm_win_frame_add(sd, element, style);
5721 5781
5722 if (sd->indimode != EFL_UI_WIN_INDICATOR_OFF) 5782 if (sd->indimode != EFL_UI_WIN_INDICATOR_MODE_OFF)
5723 _indicator_add(sd); 5783 _indicator_add(sd);
5724 5784
5725 if (_elm_config->focus_highlight_enable) 5785 if (_elm_config->focus_highlight_enable)
@@ -5740,7 +5800,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
5740 efl_event_callback_array_add(obj, _elm_win_tracking(), sd); 5800 efl_event_callback_array_add(obj, _elm_win_tracking(), sd);
5741 evas_object_show(sd->legacy.edje); 5801 evas_object_show(sd->legacy.edje);
5742 5802
5743 if (type == ELM_WIN_FAKE) 5803 if (type == EFL_UI_WIN_TYPE_FAKE)
5744 { 5804 {
5745 _elm_win_resize_job(obj); 5805 _elm_win_resize_job(obj);
5746 _elm_win_move(sd->ee); 5806 _elm_win_move(sd->ee);
@@ -5756,9 +5816,9 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
5756 { 5816 {
5757 switch (type) 5817 switch (type)
5758 { 5818 {
5759 case EFL_UI_WIN_UNKNOWN: 5819 case EFL_UI_WIN_TYPE_UNKNOWN:
5760 case EFL_UI_WIN_BASIC: 5820 case EFL_UI_WIN_TYPE_BASIC:
5761 case EFL_UI_WIN_DIALOG_BASIC: 5821 case EFL_UI_WIN_TYPE_DIALOG_BASIC:
5762 _elm_win_standard_init(obj); 5822 _elm_win_standard_init(obj);
5763 break; 5823 break;
5764 default: break; 5824 default: break;
@@ -5812,7 +5872,7 @@ EOLIAN static void
5812_efl_ui_win_efl_object_destructor(Eo *obj, Efl_Ui_Win_Data *pd EINA_UNUSED) 5872_efl_ui_win_efl_object_destructor(Eo *obj, Efl_Ui_Win_Data *pd EINA_UNUSED)
5813{ 5873{
5814#ifdef HAVE_ELEMENTARY_WL2 5874#ifdef HAVE_ELEMENTARY_WL2
5815 if (pd->type == ELM_WIN_FAKE) 5875 if (pd->type == EFL_UI_WIN_TYPE_FAKE)
5816 { 5876 {
5817 if (pd->wl.win) 5877 if (pd->wl.win)
5818 ecore_wl2_window_free(pd->wl.win); 5878 ecore_wl2_window_free(pd->wl.win);
@@ -6218,7 +6278,7 @@ _efl_ui_win_fullscreen_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool f
6218 // these engines... can ONLY be fullscreen 6278 // these engines... can ONLY be fullscreen
6219 return; 6279 return;
6220 } 6280 }
6221 else if (sd->type == ELM_WIN_FAKE) 6281 else if (sd->type == EFL_UI_WIN_TYPE_FAKE)
6222 sd->fullscreen = !!fullscreen; 6282 sd->fullscreen = !!fullscreen;
6223 else 6283 else
6224 { 6284 {
@@ -6480,8 +6540,8 @@ _efl_ui_win_urgent_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Urge
6480EOLIAN static Efl_Ui_Win_Urgent_Mode 6540EOLIAN static Efl_Ui_Win_Urgent_Mode
6481_efl_ui_win_urgent_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) 6541_efl_ui_win_urgent_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
6482{ 6542{
6483 if (sd->urgent) return EFL_UI_WIN_URGENT_URGENT; 6543 if (sd->urgent) return EFL_UI_WIN_URGENT_MODE_URGENT;
6484 return EFL_UI_WIN_URGENT_NONE; 6544 return EFL_UI_WIN_URGENT_MODE_NONE;
6485} 6545}
6486 6546
6487EOLIAN static void 6547EOLIAN static void
@@ -6506,8 +6566,8 @@ _efl_ui_win_modal_set(Eo *obj, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Modal_Mode modal)
6506EOLIAN static Efl_Ui_Win_Modal_Mode 6566EOLIAN static Efl_Ui_Win_Modal_Mode
6507_efl_ui_win_modal_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) 6567_efl_ui_win_modal_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
6508{ 6568{
6509 if (sd->modal) return EFL_UI_WIN_MODAL_MODAL; 6569 if (sd->modal) return EFL_UI_WIN_MODAL_MODE_MODAL;
6510 return EFL_UI_WIN_MODAL_NONE; 6570 return EFL_UI_WIN_MODAL_MODE_NONE;
6511} 6571}
6512 6572
6513static void 6573static void
@@ -6767,7 +6827,7 @@ _efl_ui_win_sticky_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
6767} 6827}
6768 6828
6769EOLIAN static void 6829EOLIAN static void
6770_efl_ui_win_keyboard_mode_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Elm_Win_Keyboard_Mode mode) 6830_efl_ui_win_keyboard_mode_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Keyboard_Mode mode)
6771{ 6831{
6772 if (mode == sd->kbdmode) return; 6832 if (mode == sd->kbdmode) return;
6773#ifdef HAVE_ELEMENTARY_X 6833#ifdef HAVE_ELEMENTARY_X
@@ -6781,7 +6841,7 @@ _efl_ui_win_keyboard_mode_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Elm_Win_
6781#endif 6841#endif
6782} 6842}
6783 6843
6784EOLIAN static Elm_Win_Keyboard_Mode 6844EOLIAN static Efl_Ui_Win_Keyboard_Mode
6785_efl_ui_win_keyboard_mode_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) 6845_efl_ui_win_keyboard_mode_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
6786{ 6846{
6787 return sd->kbdmode; 6847 return sd->kbdmode;
@@ -6794,7 +6854,7 @@ _efl_ui_win_indicator_mode_set(Eo *obj, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Indicato
6794 if (sd->indimode == mode) return; 6854 if (sd->indimode == mode) return;
6795 sd->indimode = mode; 6855 sd->indimode = mode;
6796 6856
6797 if (sd->indimode == EFL_UI_WIN_INDICATOR_OFF) 6857 if (sd->indimode == EFL_UI_WIN_INDICATOR_MODE_OFF)
6798 { 6858 {
6799 _indicator_del(sd); 6859 _indicator_del(sd);
6800 return; 6860 return;
@@ -6804,20 +6864,20 @@ _efl_ui_win_indicator_mode_set(Eo *obj, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Indicato
6804 6864
6805 if (elm_widget_is_legacy(obj)) 6865 if (elm_widget_is_legacy(obj))
6806 { 6866 {
6807 if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_OPAQUE) 6867 if (sd->indimode == EFL_UI_WIN_INDICATOR_MODE_BG_OPAQUE)
6808 edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,bg_opaque", "elm"); 6868 edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,bg_opaque", "elm");
6809 else if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_TRANSPARENT) 6869 else if (sd->indimode == EFL_UI_WIN_INDICATOR_MODE_BG_TRANSPARENT)
6810 edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,bg_transparent", "elm"); 6870 edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,bg_transparent", "elm");
6811 else if (sd->indimode == EFL_UI_WIN_INDICATOR_HIDDEN) 6871 else if (sd->indimode == EFL_UI_WIN_INDICATOR_MODE_HIDDEN)
6812 edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,hidden", "elm"); 6872 edje_object_signal_emit(sd->frame_obj, "elm,action,indicator,hidden", "elm");
6813 } 6873 }
6814 else 6874 else
6815 { 6875 {
6816 if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_OPAQUE) 6876 if (sd->indimode == EFL_UI_WIN_INDICATOR_MODE_BG_OPAQUE)
6817 edje_object_signal_emit(sd->frame_obj, "efl,action,indicator,bg_opaque", "efl"); 6877 edje_object_signal_emit(sd->frame_obj, "efl,action,indicator,bg_opaque", "efl");
6818 else if (sd->indimode == EFL_UI_WIN_INDICATOR_BG_TRANSPARENT) 6878 else if (sd->indimode == EFL_UI_WIN_INDICATOR_MODE_BG_TRANSPARENT)
6819 edje_object_signal_emit(sd->frame_obj, "efl,action,indicator,bg_transparent", "efl"); 6879 edje_object_signal_emit(sd->frame_obj, "efl,action,indicator,bg_transparent", "efl");
6820 else if (sd->indimode == EFL_UI_WIN_INDICATOR_HIDDEN) 6880 else if (sd->indimode == EFL_UI_WIN_INDICATOR_MODE_HIDDEN)
6821 edje_object_signal_emit(sd->frame_obj, "efl,action,indicator,hidden", "efl"); 6881 edje_object_signal_emit(sd->frame_obj, "efl,action,indicator,hidden", "efl");
6822 } 6882 }
6823 6883
@@ -8401,7 +8461,7 @@ elm_win_modal_set(Evas_Object *obj, Eina_Bool modal)
8401{ 8461{
8402 Efl_Ui_Win_Modal_Mode modality; 8462 Efl_Ui_Win_Modal_Mode modality;
8403 8463
8404 modality = modal ? EFL_UI_WIN_MODAL_MODAL : EFL_UI_WIN_MODAL_NONE; 8464 modality = modal ? EFL_UI_WIN_MODAL_MODE_MODAL : EFL_UI_WIN_MODAL_MODE_NONE;
8405 efl_ui_win_modal_set(obj, modality); 8465 efl_ui_win_modal_set(obj, modality);
8406} 8466}
8407 8467
@@ -8411,7 +8471,7 @@ elm_win_modal_get(const Evas_Object *obj)
8411 Efl_Ui_Win_Modal_Mode modality; 8471 Efl_Ui_Win_Modal_Mode modality;
8412 8472
8413 modality = efl_ui_win_modal_get(obj); 8473 modality = efl_ui_win_modal_get(obj);
8414 return (modality != EFL_UI_WIN_MODAL_NONE); 8474 return (modality != EFL_UI_WIN_MODAL_MODE_NONE);
8415} 8475}
8416 8476
8417EAPI void 8477EAPI void
@@ -8781,7 +8841,7 @@ _elm_win_legacy_init(Efl_Ui_Win_Data *sd)
8781 edje_object_part_swallow(sd->legacy.edje, "efl.contents", sd->legacy.box); 8841 edje_object_part_swallow(sd->legacy.edje, "efl.contents", sd->legacy.box);
8782 8842
8783 evas_object_geometry_set(sd->legacy.edje, 0, 0, 1, 1); 8843 evas_object_geometry_set(sd->legacy.edje, 0, 0, 1, 1);
8784 if (sd->type != ELM_WIN_FAKE) 8844 if (sd->type != EFL_UI_WIN_TYPE_FAKE)
8785 { 8845 {
8786 edje_object_update_hints_set(sd->legacy.edje, EINA_TRUE); 8846 edje_object_update_hints_set(sd->legacy.edje, EINA_TRUE);
8787 evas_object_event_callback_add(sd->legacy.edje, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 8847 evas_object_event_callback_add(sd->legacy.edje, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
@@ -8933,7 +8993,7 @@ EAPI void
8933elm_win_type_set(Evas_Object *obj, Elm_Win_Type type) 8993elm_win_type_set(Evas_Object *obj, Elm_Win_Type type)
8934{ 8994{
8935 ERR("Calling deprecrated function '%s'", __FUNCTION__); 8995 ERR("Calling deprecrated function '%s'", __FUNCTION__);
8936 efl_ui_win_type_set(obj, type); 8996 efl_ui_win_type_set(obj, _elm_win_type_to_efl_ui_win_type(type));
8937} 8997}
8938 8998
8939EAPI void 8999EAPI void
@@ -8987,8 +9047,45 @@ _efl_ui_win_legacy_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED)
8987 return obj; 9047 return obj;
8988} 9048}
8989 9049
9050
9051Efl_Object *_efl_ui_win_legacy_efl_object_finalize(Eo *obj, void *pd);
9052
9053
9054static Eina_Bool
9055_efl_ui_win_legacy_class_initializer(Efl_Class *klass)
9056{
9057 const Efl_Object_Ops *opsp = NULL;
9058
9059 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
9060
9061#ifndef EFL_UI_WIN_LEGACY_EXTRA_OPS
9062#define EFL_UI_WIN_LEGACY_EXTRA_OPS
9063#endif
9064
9065 EFL_OPS_DEFINE(ops,
9066 EFL_OBJECT_OP_FUNC(efl_finalize, _efl_ui_win_legacy_efl_object_finalize),
9067 EFL_UI_WIN_LEGACY_EXTRA_OPS
9068 );
9069 opsp = &ops;
9070
9071 return efl_class_functions_set(klass, opsp, ropsp);
9072}
9073
9074static const Efl_Class_Description _efl_ui_win_legacy_class_desc = {
9075 EO_VERSION,
9076 "Efl.Ui.Win_Legacy",
9077 EFL_CLASS_TYPE_REGULAR,
9078 0,
9079 _efl_ui_win_legacy_class_initializer,
9080 _efl_ui_win_legacy_class_constructor,
9081 NULL
9082};
9083
9084EFL_DEFINE_CLASS(efl_ui_win_legacy_class_get, &_efl_ui_win_legacy_class_desc, EFL_UI_WIN_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);
9085
9086
8990EAPI Evas_Object * 9087EAPI Evas_Object *
8991elm_win_add(Evas_Object *parent, const char *name, Efl_Ui_Win_Type type) 9088elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
8992{ 9089{
8993 const Efl_Class *klass = EFL_UI_WIN_LEGACY_CLASS; 9090 const Efl_Class *klass = EFL_UI_WIN_LEGACY_CLASS;
8994 9091
@@ -9011,7 +9108,7 @@ elm_win_fake_add(Ecore_Evas *ee)
9011 return elm_legacy_add(EFL_UI_WIN_LEGACY_CLASS, NULL, 9108 return elm_legacy_add(EFL_UI_WIN_LEGACY_CLASS, NULL,
9012 _fake_canvas_set(efl_added, ee), 9109 _fake_canvas_set(efl_added, ee),
9013 efl_ui_win_name_set(efl_added, NULL), 9110 efl_ui_win_name_set(efl_added, NULL),
9014 efl_ui_win_type_set(efl_added, ELM_WIN_FAKE)); 9111 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_FAKE));
9015} 9112}
9016 9113
9017EAPI Evas_Object * 9114EAPI Evas_Object *
@@ -9022,7 +9119,7 @@ elm_win_util_standard_add(const char *name, const char *title)
9022 win = elm_legacy_add(EFL_UI_WIN_LEGACY_CLASS, NULL, 9119 win = elm_legacy_add(EFL_UI_WIN_LEGACY_CLASS, NULL,
9023 efl_text_set(efl_added, title), 9120 efl_text_set(efl_added, title),
9024 efl_ui_win_name_set(efl_added, name), 9121 efl_ui_win_name_set(efl_added, name),
9025 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC)); 9122 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC));
9026 if (!win) return NULL; 9123 if (!win) return NULL;
9027 9124
9028 _elm_win_standard_init(win); 9125 _elm_win_standard_init(win);
@@ -9037,11 +9134,244 @@ elm_win_util_dialog_add(Evas_Object *parent, const char *name, const char *title
9037 win = elm_legacy_add(EFL_UI_WIN_LEGACY_CLASS, parent, 9134 win = elm_legacy_add(EFL_UI_WIN_LEGACY_CLASS, parent,
9038 efl_text_set(efl_added, title), 9135 efl_text_set(efl_added, title),
9039 efl_ui_win_name_set(efl_added, name), 9136 efl_ui_win_name_set(efl_added, name),
9040 efl_ui_win_type_set(efl_added, EFL_UI_WIN_DIALOG_BASIC)); 9137 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_DIALOG_BASIC));
9041 if (!win) return NULL; 9138 if (!win) return NULL;
9042 9139
9043 _elm_win_standard_init(win); 9140 _elm_win_standard_init(win);
9044 return win; 9141 return win;
9045} 9142}
9046 9143
9047#include "efl_ui_win_legacy.eo.c" 9144
9145EAPI void
9146elm_win_keyboard_mode_set(Evas_Object *obj, Elm_Win_Keyboard_Mode mode)
9147{
9148 efl_ui_win_keyboard_mode_set(obj, mode);
9149}
9150
9151EAPI Elm_Win_Keyboard_Mode
9152elm_win_keyboard_mode_get(const Evas_Object *obj)
9153{
9154 return efl_ui_win_keyboard_mode_get(obj);
9155}
9156
9157EAPI void
9158elm_win_screen_constrain_set(Evas_Object *obj, Eina_Bool constrain)
9159{
9160 efl_ui_win_screen_constrain_set(obj, constrain);
9161}
9162
9163EAPI Eina_Bool
9164elm_win_screen_constrain_get(const Evas_Object *obj)
9165{
9166 return efl_ui_win_screen_constrain_get(obj);
9167}
9168
9169EAPI void
9170elm_win_prop_focus_skip_set(Evas_Object *obj, Eina_Bool skip)
9171{
9172 efl_ui_win_prop_focus_skip_set(obj, skip);
9173}
9174
9175EAPI void
9176elm_win_autohide_set(Evas_Object *obj, Eina_Bool autohide)
9177{
9178 efl_ui_win_autohide_set(obj, autohide);
9179}
9180
9181EAPI Eina_Bool
9182elm_win_autohide_get(const Evas_Object *obj)
9183{
9184 return efl_ui_win_autohide_get(obj);
9185}
9186
9187EAPI void
9188elm_win_exit_on_close_set(Evas_Object *obj, const Eina_Value *exit_code)
9189{
9190 efl_ui_win_exit_on_close_set(obj, exit_code);
9191}
9192
9193EAPI const Eina_Value *
9194elm_win_exit_on_close_get(const Evas_Object *obj)
9195{
9196 return efl_ui_win_exit_on_close_get(obj);
9197}
9198
9199EAPI void
9200elm_win_icon_object_set(Evas_Object *obj, Evas_Object *icon)
9201{
9202 efl_ui_win_icon_object_set(obj, icon);
9203}
9204
9205EAPI const Evas_Object *
9206elm_win_icon_object_get(const Evas_Object *obj)
9207{
9208 return efl_ui_win_icon_object_get(obj);
9209}
9210
9211EAPI void
9212elm_win_iconified_set(Evas_Object *obj, Eina_Bool iconified)
9213{
9214 efl_ui_win_minimized_set(obj, iconified);
9215}
9216
9217EAPI Eina_Bool
9218elm_win_iconified_get(const Evas_Object *obj)
9219{
9220 return efl_ui_win_minimized_get(obj);
9221}
9222
9223EAPI void
9224elm_win_maximized_set(Evas_Object *obj, Eina_Bool maximized)
9225{
9226 efl_ui_win_maximized_set(obj, maximized);
9227}
9228
9229EAPI Eina_Bool
9230elm_win_maximized_get(const Evas_Object *obj)
9231{
9232 return efl_ui_win_maximized_get(obj);
9233}
9234
9235EAPI void
9236elm_win_fullscreen_set(Evas_Object *obj, Eina_Bool fullscreen)
9237{
9238 efl_ui_win_fullscreen_set(obj, fullscreen);
9239}
9240
9241EAPI Eina_Bool
9242elm_win_fullscreen_get(const Evas_Object *obj)
9243{
9244 return efl_ui_win_fullscreen_get(obj);
9245}
9246
9247EAPI void
9248elm_win_sticky_set(Evas_Object *obj, Eina_Bool sticky)
9249{
9250 efl_ui_win_sticky_set(obj, sticky);
9251}
9252
9253EAPI Eina_Bool
9254elm_win_sticky_get(const Evas_Object *obj)
9255{
9256 return efl_ui_win_sticky_get(obj);
9257}
9258
9259EAPI void
9260elm_win_noblank_set(Evas_Object *obj, Eina_Bool noblank)
9261{
9262 efl_ui_win_noblank_set(obj, noblank);
9263}
9264
9265EAPI Eina_Bool
9266elm_win_noblank_get(const Evas_Object *obj)
9267{
9268 return efl_ui_win_noblank_get(obj);
9269}
9270
9271EAPI void
9272elm_win_borderless_set(Evas_Object *obj, Eina_Bool borderless)
9273{
9274 efl_ui_win_borderless_set(obj, borderless);
9275}
9276
9277EAPI Eina_Bool
9278elm_win_borderless_get(const Evas_Object *obj)
9279{
9280 return efl_ui_win_borderless_get(obj);
9281}
9282
9283EAPI void
9284elm_win_role_set(Evas_Object *obj, const char *role)
9285{
9286 efl_ui_win_role_set(obj, role);
9287}
9288
9289EAPI const char *
9290elm_win_role_get(const Evas_Object *obj)
9291{
9292 return efl_ui_win_role_get(obj);
9293}
9294
9295EAPI const char *
9296elm_win_name_get(const Evas_Object *obj)
9297{
9298 return efl_ui_win_name_get(obj);
9299}
9300
9301EAPI Elm_Win_Type
9302elm_win_type_get(const Evas_Object *obj)
9303{
9304 return _efl_ui_win_type_to_elm_win_type(efl_ui_win_type_get(obj));
9305}
9306
9307EAPI const char *
9308elm_win_accel_preference_get(const Evas_Object *obj)
9309{
9310 return efl_ui_win_accel_preference_get(obj);
9311}
9312
9313EAPI void
9314elm_win_alpha_set(Evas_Object *obj, Eina_Bool alpha)
9315{
9316 efl_ui_win_alpha_set(obj, alpha);
9317}
9318
9319EAPI Eina_Bool
9320elm_win_alpha_get(const Evas_Object *obj)
9321{
9322 return efl_ui_win_alpha_get(obj);
9323}
9324
9325EAPI void
9326elm_win_activate(Evas_Object *obj)
9327{
9328 efl_ui_win_activate(obj);
9329}
9330
9331EAPI void
9332elm_win_center(Evas_Object *obj, Eina_Bool h, Eina_Bool v)
9333{
9334 efl_ui_win_center(obj, h, v);
9335}
9336
9337EAPI Eina_Bool
9338elm_win_move_resize_start(Evas_Object *obj, Elm_Win_Move_Resize_Mode mode)
9339{
9340 return efl_ui_win_move_resize_start(obj, mode);
9341}
9342
9343EAPI void
9344elm_win_focus_highlight_animate_set(Efl_Ui_Win *obj, Eina_Bool animate)
9345{
9346 efl_ui_win_focus_highlight_animate_set(obj, animate);
9347}
9348
9349EAPI Eina_Bool
9350elm_win_focus_highlight_animate_get(const Efl_Ui_Win *obj)
9351{
9352 return efl_ui_win_focus_highlight_animate_get(obj);
9353}
9354
9355EAPI void
9356elm_win_focus_highlight_enabled_set(Efl_Ui_Win *obj, Eina_Bool enabled)
9357{
9358 efl_ui_win_focus_highlight_enabled_set(obj, enabled);
9359}
9360
9361EAPI Eina_Bool
9362elm_win_focus_highlight_enabled_get(const Efl_Ui_Win *obj)
9363{
9364 return efl_ui_win_focus_highlight_enabled_get(obj);
9365}
9366
9367EAPI Eina_Bool
9368elm_win_focus_highlight_style_set(Efl_Ui_Win *obj, const char *style)
9369{
9370 return efl_ui_win_focus_highlight_style_set(obj, style);
9371}
9372
9373EAPI const char *
9374elm_win_focus_highlight_style_get(const Efl_Ui_Win *obj)
9375{
9376 return efl_ui_win_focus_highlight_style_get(obj);
9377}
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 0eeac1970c..301435f2d3 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -10,7 +10,6 @@ enum Efl.Ui.Win_Type
10 10
11 Currently, only the X11 backed engines use them. 11 Currently, only the X11 backed engines use them.
12 ]] 12 ]]
13 legacy: efl_ui_win;
14 13
15 unknown = -1, [[Default, unknown, type]] 14 unknown = -1, [[Default, unknown, type]]
16 basic, [[A normal window. Indicates a normal, top-level window. Almost every 15 basic, [[A normal window. Indicates a normal, top-level window. Almost every
@@ -38,6 +37,10 @@ enum Efl.Ui.Win_Type
38 a new E-Mail received.]] 37 a new E-Mail received.]]
39 combo, [[A window holding the contents of a combo box. Not usually used in 38 combo, [[A window holding the contents of a combo box. Not usually used in
40 the EFL.]] 39 the EFL.]]
40 dnd,
41 inlined_image,
42 socket_image,
43 fake,
41 /* Some types have been removed from EO. Skipping to 17. */ 44 /* Some types have been removed from EO. Skipping to 17. */
42 naviframe_basic = 17 [[Used for naviframe style replacement with a back 45 naviframe_basic = 17 [[Used for naviframe style replacement with a back
43 button instead of a close button. 46 button instead of a close button.
@@ -52,7 +55,6 @@ enum Efl.Ui.Win_Keyboard_Mode
52 When the application window is being managed by Illume it may request 55 When the application window is being managed by Illume it may request
53 any of the following layouts for the virtual keyboard. 56 any of the following layouts for the virtual keyboard.
54 ]] 57 ]]
55 legacy: efl_ui_win_keyboard;
56 58
57 unknown, [[Unknown keyboard state]] 59 unknown, [[Unknown keyboard state]]
58 off, [[Request to deactivate the keyboard]] 60 off, [[Request to deactivate the keyboard]]
@@ -75,7 +77,6 @@ enum Efl.Ui.Win_Keyboard_Mode
75enum Efl.Ui.Win_Indicator_Mode 77enum Efl.Ui.Win_Indicator_Mode
76{ 78{
77 [[Defines the type indicator that can be shown]] 79 [[Defines the type indicator that can be shown]]
78 legacy: efl_ui_win_indicator;
79 80
80 off, [[Request to deactivate the indicator]] 81 off, [[Request to deactivate the indicator]]
81 bg_opaque, [[The indicator icon is opaque, as is the indicator background. 82 bg_opaque, [[The indicator icon is opaque, as is the indicator background.
@@ -93,7 +94,6 @@ enum Efl.Ui.Win_Keygrab_Mode
93 [[Define the keygrab modes of window. A window may send commands to the 94 [[Define the keygrab modes of window. A window may send commands to the
94 Keyrouter according this mode, and perform different actions.]] 95 Keyrouter according this mode, and perform different actions.]]
95 96
96 legacy: efl_ui_win_keygrab;
97 unknown = 0, [[Unknown keygrab mode]] 97 unknown = 0, [[Unknown keygrab mode]]
98 shared = (1 << 8), [[Get the grabbed-key together with the other client 98 shared = (1 << 8), [[Get the grabbed-key together with the other client
99 windows]] 99 windows]]
@@ -110,7 +110,6 @@ enum Efl.Ui.Win_Keygrab_Mode
110enum Efl.Ui.Win_Modal_Mode 110enum Efl.Ui.Win_Modal_Mode
111{ 111{
112 [[Defines the mode of a modal window]] 112 [[Defines the mode of a modal window]]
113 legacy: efl_ui_win_modal;
114 113
115 none, [[The window is not modal window.]] 114 none, [[The window is not modal window.]]
116 modal [[The window is modal window.]] 115 modal [[The window is modal window.]]
@@ -119,7 +118,6 @@ enum Efl.Ui.Win_Modal_Mode
119enum Efl.Ui.Win_Urgent_Mode 118enum Efl.Ui.Win_Urgent_Mode
120{ 119{
121 [[Defines the mode of a urgent window.]] 120 [[Defines the mode of a urgent window.]]
122 legacy: efl_ui_win_urgent;
123 121
124 none, [[The window is not a urgent window.]] 122 none, [[The window is not a urgent window.]]
125 urgent [[The window is a urgent window.]] 123 urgent [[The window is a urgent window.]]
@@ -147,7 +145,6 @@ enum Efl.Ui.Win_Move_Resize_Mode
147 145
148 @since 1.19 146 @since 1.19
149 ]] 147 ]]
150 legacy: efl_ui_win_move_resize;
151 148
152 move = 1, [[Start moving window]] 149 move = 1, [[Start moving window]]
153 top = (1 << 1), [[Start resizing window to the top]] 150 top = (1 << 1), [[Start resizing window to the top]]
@@ -163,7 +160,6 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
163 Efl.Ui.Widget_Focus_Manager, Efl.Ui.Focus.Manager_Window_Root 160 Efl.Ui.Widget_Focus_Manager, Efl.Ui.Focus.Manager_Window_Root
164{ 161{
165 [[Efl UI window class]] 162 [[Efl UI window class]]
166 legacy_prefix: elm_win;
167 methods { 163 methods {
168 @property indicator_mode { 164 @property indicator_mode {
169 [[In some environments you may have an indicator that 165 [[In some environments you may have an indicator that
@@ -178,10 +174,8 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
178 @since 1.18 174 @since 1.18
179 ]] 175 ]]
180 set { 176 set {
181 legacy: null;
182 } 177 }
183 get { 178 get {
184 legacy: null;
185 } 179 }
186 values { 180 values {
187 type: Efl.Ui.Win_Indicator_Mode; [[The mype, one of @Efl.Ui.Win_Indicator_Mode.]] 181 type: Efl.Ui.Win_Indicator_Mode; [[The mype, one of @Efl.Ui.Win_Indicator_Mode.]]
@@ -211,10 +205,8 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
211 allow_270: bool; [[Rotated 270 degrees CCW (i.e. 90 CW).]] 205 allow_270: bool; [[Rotated 270 degrees CCW (i.e. 90 CW).]]
212 } 206 }
213 set { 207 set {
214 legacy: null;
215 } 208 }
216 get { 209 get {
217 legacy: null;
218 return: bool; [[Returns $false if available rotations were 210 return: bool; [[Returns $false if available rotations were
219 not specified.]] 211 not specified.]]
220 } 212 }
@@ -222,10 +214,8 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
222 @property wm_available_profiles { 214 @property wm_available_profiles {
223 [[Available profiles on a window.]] 215 [[Available profiles on a window.]]
224 set { 216 set {
225 legacy: null;
226 } 217 }
227 get { 218 get {
228 legacy: null;
229 } 219 }
230 values { 220 values {
231 profiles: const(array<string>); [[A list of profiles.]] 221 profiles: const(array<string>); [[A list of profiles.]]
@@ -347,11 +337,9 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
347 @property minimized { 337 @property minimized {
348 set { 338 set {
349 [[Set the minimized state of a window.]] 339 [[Set the minimized state of a window.]]
350 legacy: elm_win_iconified_set;
351 } 340 }
352 get { 341 get {
353 [[Get the minimized state of a window.]] 342 [[Get the minimized state of a window.]]
354 legacy: elm_win_iconified_get;
355 } 343 }
356 values { 344 values {
357 state: bool; [[If $true, the window is minimized.]] 345 state: bool; [[If $true, the window is minimized.]]
@@ -398,11 +386,9 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
398 @property urgent { 386 @property urgent {
399 set { 387 set {
400 [[Set the urgent state of a window.]] 388 [[Set the urgent state of a window.]]
401 legacy: null;
402 } 389 }
403 get { 390 get {
404 [[Get the urgent state of a window.]] 391 [[Get the urgent state of a window.]]
405 legacy: null;
406 } 392 }
407 values { 393 values {
408 urgent: Efl.Ui.Win_Urgent_Mode; 394 urgent: Efl.Ui.Win_Urgent_Mode;
@@ -412,11 +398,9 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
412 @property modal { 398 @property modal {
413 set { 399 set {
414 [[Set the modal state of a window.]] 400 [[Set the modal state of a window.]]
415 legacy: null;
416 } 401 }
417 get { 402 get {
418 [[Get the modal state of a window.]] 403 [[Get the modal state of a window.]]
419 legacy: null;
420 } 404 }
421 values { 405 values {
422 modal: Efl.Ui.Win_Modal_Mode; [[The mode of a window, one of @Efl.Ui.Win_Modal_Mode.]] 406 modal: Efl.Ui.Win_Modal_Mode; [[The mode of a window, one of @Efl.Ui.Win_Modal_Mode.]]
@@ -471,7 +455,6 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
471 ]] 455 ]]
472 set { 456 set {
473 [[Set the role of the window.]] 457 [[Set the role of the window.]]
474 legacy: elm_win_role_set;
475 } 458 }
476 get { 459 get {
477 [[Get the role of the window. 460 [[Get the role of the window.
@@ -480,7 +463,6 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
480 freed or modified. It will also be invalid if a new role 463 freed or modified. It will also be invalid if a new role
481 is set or if the window is destroyed. 464 is set or if the window is destroyed.
482 ]] 465 ]]
483 legacy: elm_win_role_get;
484 } 466 }
485 values { 467 values {
486 role: string; [[The role to set.]] 468 role: string; [[The role to set.]]
@@ -498,11 +480,9 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
498 ]] 480 ]]
499 set { 481 set {
500 [[Name can only be set before finalize.]] 482 [[Name can only be set before finalize.]]
501 legacy: null;
502 } 483 }
503 get { 484 get {
504 [[ @since 1.18 ]] 485 [[ @since 1.18 ]]
505 legacy: elm_win_name_get;
506 } 486 }
507 values { 487 values {
508 name: string @nullable; [[Window name]] 488 name: string @nullable; [[Window name]]
@@ -520,11 +500,9 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
520 ]] 500 ]]
521 set { 501 set {
522 [[Type can on be set before finalize.]] 502 [[Type can on be set before finalize.]]
523 legacy: null;
524 } 503 }
525 get { 504 get {
526 [[If the object is not window object, returns $unknown.]] 505 [[If the object is not window object, returns $unknown.]]
527 legacy: elm_win_type_get;
528 } 506 }
529 values { 507 values {
530 type: Efl.Ui.Win_Type(Efl.Ui.Win_Type.unknown); [[Window type]] 508 type: Efl.Ui.Win_Type(Efl.Ui.Win_Type.unknown); [[Window type]]
@@ -579,7 +557,6 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
579 accel: string; [[Acceleration]] 557 accel: string; [[Acceleration]]
580 } 558 }
581 set { 559 set {
582 legacy: null;
583 } 560 }
584 get { 561 get {
585 [[This will return the value of "accel_preference" when the window 562 [[This will return the value of "accel_preference" when the window
@@ -730,7 +707,6 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
730 @in grab_mode: Efl.Ui.Win_Keygrab_Mode; [[Describes how the key should 707 @in grab_mode: Efl.Ui.Win_Keygrab_Mode; [[Describes how the key should
731 be grabbed, wrt. focus and stacking.]] 708 be grabbed, wrt. focus and stacking.]]
732 } 709 }
733 legacy: null;
734 } 710 }
735 keygrab_unset { 711 keygrab_unset {
736 [[Unset keygrab value of the window 712 [[Unset keygrab value of the window
@@ -745,7 +721,6 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
745 @in not_modifiers: Efl.Input.Modifier; [[A combination of modifier keys 721 @in not_modifiers: Efl.Input.Modifier; [[A combination of modifier keys
746 that must not be present to trigger the event. Not supported yet.]] 722 that must not be present to trigger the event. Not supported yet.]]
747 } 723 }
748 legacy: null;
749 } 724 }
750 move_resize_start { 725 move_resize_start {
751 [[Start moving or resizing the window. 726 [[Start moving or resizing the window.
@@ -855,10 +830,8 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
855 The value will automatically change when the WM of this window changes its rotation. This rotation is automatically applied to all @Efl.Ui.Layout objects. 830 The value will automatically change when the WM of this window changes its rotation. This rotation is automatically applied to all @Efl.Ui.Layout objects.
856 ]] 831 ]]
857 set { 832 set {
858 legacy: null;
859 } 833 }
860 get { 834 get {
861 legacy: null;
862 } 835 }
863 values { 836 values {
864 rotation : Efl.Orient; [[The rotation of the window]] 837 rotation : Efl.Orient; [[The rotation of the window]]
diff --git a/src/lib/elementary/efl_ui_win_inlined.c b/src/lib/elementary/efl_ui_win_inlined.c
index 54407b7705..403dde50cc 100644
--- a/src/lib/elementary/efl_ui_win_inlined.c
+++ b/src/lib/elementary/efl_ui_win_inlined.c
@@ -36,7 +36,7 @@ _efl_ui_win_inlined_inlined_parent_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Inl
36EOLIAN static Efl_Object * 36EOLIAN static Efl_Object *
37_efl_ui_win_inlined_efl_object_finalize(Eo *obj, Efl_Ui_Win_Inlined_Data *pd EINA_UNUSED) 37_efl_ui_win_inlined_efl_object_finalize(Eo *obj, Efl_Ui_Win_Inlined_Data *pd EINA_UNUSED)
38{ 38{
39 efl_ui_win_type_set(obj, ELM_WIN_INLINED_IMAGE); 39 efl_ui_win_type_set(obj, EFL_UI_WIN_TYPE_INLINED_IMAGE);
40 obj = efl_finalize(efl_super(obj, MY_CLASS)); 40 obj = efl_finalize(efl_super(obj, MY_CLASS));
41 41
42 return obj; 42 return obj;
diff --git a/src/lib/elementary/efl_ui_win_socket.c b/src/lib/elementary/efl_ui_win_socket.c
index 14ddfdc83f..544eddefbc 100644
--- a/src/lib/elementary/efl_ui_win_socket.c
+++ b/src/lib/elementary/efl_ui_win_socket.c
@@ -21,7 +21,7 @@ typedef struct
21EOLIAN static Efl_Object * 21EOLIAN static Efl_Object *
22_efl_ui_win_socket_efl_object_finalize(Eo *obj, Efl_Ui_Win_Socket_Data *pd EINA_UNUSED) 22_efl_ui_win_socket_efl_object_finalize(Eo *obj, Efl_Ui_Win_Socket_Data *pd EINA_UNUSED)
23{ 23{
24 efl_ui_win_type_set(obj, ELM_WIN_SOCKET_IMAGE); 24 efl_ui_win_type_set(obj, EFL_UI_WIN_TYPE_SOCKET_IMAGE);
25 obj = efl_finalize(efl_super(obj, MY_CLASS)); 25 obj = efl_finalize(efl_super(obj, MY_CLASS));
26 26
27 return obj; 27 return obj;
diff --git a/src/lib/elementary/elm_win_legacy.h b/src/lib/elementary/elm_win_legacy.h
index ef4f74fa14..613e0eb74b 100644
--- a/src/lib/elementary/elm_win_legacy.h
+++ b/src/lib/elementary/elm_win_legacy.h
@@ -1,5 +1,3 @@
1#include "efl_ui_win.eo.legacy.h"
2
3/** 1/**
4 * @brief In some environments, like phones, you may have an indicator that 2 * @brief In some environments, like phones, you may have an indicator that
5 * shows battery status, reception, time etc. This is the indicator. 3 * shows battery status, reception, time etc. This is the indicator.
@@ -50,59 +48,145 @@ typedef enum
50 ELM_ILLUME_COMMAND_CLOSE /** Closes the currently active window */ 48 ELM_ILLUME_COMMAND_CLOSE /** Closes the currently active window */
51} Elm_Illume_Command; 49} Elm_Illume_Command;
52 50
53typedef Efl_Ui_Win_Type Elm_Win_Type; 51
54 52/**
55#define ELM_WIN_UNKNOWN EFL_UI_WIN_UNKNOWN 53 * @brief Defines the types of window that can be created
56#define ELM_WIN_BASIC EFL_UI_WIN_BASIC 54 *
57#define ELM_WIN_DIALOG_BASIC EFL_UI_WIN_DIALOG_BASIC 55 * These are hints set on a window so that a running Window Manager knows how
58#define ELM_WIN_DESKTOP EFL_UI_WIN_DESKTOP 56 * the window should be handled and/or what kind of decorations it should have.
59#define ELM_WIN_DOCK EFL_UI_WIN_DOCK 57 *
60#define ELM_WIN_TOOLBAR EFL_UI_WIN_TOOLBAR 58 * Currently, only the X11 backed engines use them.
61#define ELM_WIN_MENU EFL_UI_WIN_MENU 59 *
62#define ELM_WIN_UTILITY EFL_UI_WIN_UTILITY 60 * @ingroup Elm_Win
63#define ELM_WIN_SPLASH EFL_UI_WIN_SPLASH 61 */
64#define ELM_WIN_DROPDOWN_MENU EFL_UI_WIN_DROPDOWN_MENU 62typedef enum
65#define ELM_WIN_POPUP_MENU EFL_UI_WIN_POPUP_MENU 63{
66#define ELM_WIN_TOOLTIP EFL_UI_WIN_TOOLTIP 64 ELM_WIN_UNKNOWN = -1 /* +1 */, /**< Default, unknown, type */
67#define ELM_WIN_NOTIFICATION EFL_UI_WIN_NOTIFICATION 65 ELM_WIN_BASIC, /**< A normal window. Indicates a normal, top-level window.
68#define ELM_WIN_COMBO EFL_UI_WIN_COMBO 66 * Almost every window will be created with this type. */
69/** 67 ELM_WIN_DIALOG_BASIC, /**< Used for simple dialog windows. */
70 * Used to indicate the window is a representation of an object being 68 ELM_WIN_DESKTOP, /**< For special desktop windows, like a background window
71 * dragged across different windows, or even applications. Typically 69 * holding desktop icons. */
72 * used with elm_win_override_set(). 70 ELM_WIN_DOCK, /**< The window is used as a dock or panel. Usually would be
73 */ 71 * kept on top of any other window by the Window Manager. */
74#define ELM_WIN_DND 13 72 ELM_WIN_TOOLBAR, /**< The window is used to hold a floating toolbar, or
75#define ELM_WIN_INLINED_IMAGE 14 73 * similar. */
76#define ELM_WIN_SOCKET_IMAGE 15 74 ELM_WIN_MENU, /**< Similar to @.toolbar. */
77#define ELM_WIN_FAKE 16 /**< See elm_win_fake_add(). @since 1.13 */ 75 ELM_WIN_UTILITY, /**< A persistent utility window, like a toolbox or
78#define ELM_WIN_NAVIFRAME_BASIC EFL_UI_WIN_NAVIFRAME_BASIC 76 * palette. */
79 77 ELM_WIN_SPLASH, /**< Splash window for a starting up application. */
80typedef Efl_Ui_Win_Keyboard_Mode Elm_Win_Keyboard_Mode; 78 ELM_WIN_DROPDOWN_MENU, /**< The window is a dropdown menu, as when an
81 79 * entry in a menubar is clicked. This hint exists
82#define ELM_WIN_KEYBOARD_UNKNOWN EFL_UI_WIN_KEYBOARD_UNKNOWN 80 * for completion only, as the EFL way of
83#define ELM_WIN_KEYBOARD_OFF EFL_UI_WIN_KEYBOARD_OFF 81 * implementing a menu would not normally use a
84#define ELM_WIN_KEYBOARD_ON EFL_UI_WIN_KEYBOARD_ON 82 * separate window for its contents. */
85#define ELM_WIN_KEYBOARD_ALPHA EFL_UI_WIN_KEYBOARD_ALPHA 83 ELM_WIN_POPUP_MENU, /**< Like @.dropdown_menu, but for the menu triggered
86#define ELM_WIN_KEYBOARD_NUMERIC EFL_UI_WIN_KEYBOARD_NUMERIC 84 * by right-clicking an object. */
87#define ELM_WIN_KEYBOARD_PIN EFL_UI_WIN_KEYBOARD_PIN 85 ELM_WIN_TOOLTIP, /**< The window is a tooltip. A short piece of explanatory
88#define ELM_WIN_KEYBOARD_PHONE_NUMBER EFL_UI_WIN_KEYBOARD_PHONE_NUMBER 86 * text that typically appear after the mouse cursor
89#define ELM_WIN_KEYBOARD_HEX EFL_UI_WIN_KEYBOARD_HEX 87 * hovers over an object for a while. Typically not very
90#define ELM_WIN_KEYBOARD_TERMINAL EFL_UI_WIN_KEYBOARD_TERMINAL 88 * commonly used in the EFL. */
91#define ELM_WIN_KEYBOARD_PASSWORD EFL_UI_WIN_KEYBOARD_PASSWORD 89 ELM_WIN_NOTIFICATION, /**< A notification window, like a warning about
92#define ELM_WIN_KEYBOARD_IP EFL_UI_WIN_KEYBOARD_IP 90 * battery life or a new E-Mail received. */
93#define ELM_WIN_KEYBOARD_HOST EFL_UI_WIN_KEYBOARD_HOST 91 ELM_WIN_COMBO, /**< A window holding the contents of a combo box. Not
94#define ELM_WIN_KEYBOARD_FILE EFL_UI_WIN_KEYBOARD_FILE 92 * usually used in the EFL. */
95#define ELM_WIN_KEYBOARD_URL EFL_UI_WIN_KEYBOARD_URL 93
96#define ELM_WIN_KEYBOARD_KEYPAD EFL_UI_WIN_KEYBOARD_KEYPAD 94/**
97#define ELM_WIN_KEYBOARD_J2ME EFL_UI_WIN_KEYBOARD_J2ME 95* Used to indicate the window is a representation of an object being
98 96* dragged across different windows, or even applications. Typically
99typedef Efl_Ui_Win_Keygrab_Mode Elm_Win_Keygrab_Mode; 97* used with elm_win_override_set().
100 98*/
101#define ELM_WIN_KEYGRAB_UNKNOWN EFL_UI_WIN_KEYGRAB_UNKNOWN 99 ELM_WIN_DND,
102#define ELM_WIN_KEYGRAB_SHARED EFL_UI_WIN_KEYGRAB_SHARED 100 ELM_WIN_INLINED_IMAGE,
103#define ELM_WIN_KEYGRAB_TOPMOST EFL_UI_WIN_KEYGRAB_TOPMOST 101 ELM_WIN_SOCKET_IMAGE,
104#define ELM_WIN_KEYGRAB_EXCLUSIVE EFL_UI_WIN_KEYGRAB_EXCLUSIVE 102 ELM_WIN_FAKE, /**< See elm_win_fake_add(). @since 1.13 */
105#define ELM_WIN_KEYGRAB_OVERRIDE_EXCLUSIVE EFL_UI_WIN_KEYGRAB_OVERRIDE_EXCLUSIVE 103
104 ELM_WIN_NAVIFRAME_BASIC, /**< Used for naviframe style replacement with
105 * a back button instead of a close button.
106 *
107 * @since 1.19 */
108} Elm_Win_Type;
109
110/**
111 * @brief The different layouts that can be requested for the virtual keyboard.
112 *
113 * When the application window is being managed by Illume it may request any of
114 * the following layouts for the virtual keyboard.
115 *
116 * @ingroup Elm_Win
117 */
118typedef enum
119{
120 ELM_WIN_KEYBOARD_UNKNOWN = 0, /**< Unknown keyboard state */
121 ELM_WIN_KEYBOARD_OFF, /**< Request to deactivate the keyboard */
122 ELM_WIN_KEYBOARD_ON, /**< Enable keyboard with default layout */
123 ELM_WIN_KEYBOARD_ALPHA, /**< Alpha (a-z) keyboard layout */
124 ELM_WIN_KEYBOARD_NUMERIC, /**< Numeric keyboard layout */
125 ELM_WIN_KEYBOARD_PIN, /**< PIN keyboard layout */
126 ELM_WIN_KEYBOARD_PHONE_NUMBER, /**< Phone keyboard layout */
127 ELM_WIN_KEYBOARD_HEX, /**< Hexadecimal numeric keyboard layout */
128 ELM_WIN_KEYBOARD_TERMINAL, /**< Full (QWERTY) keyboard layout */
129 ELM_WIN_KEYBOARD_PASSWORD, /**< Password keyboard layout */
130 ELM_WIN_KEYBOARD_IP, /**< IP keyboard layout */
131 ELM_WIN_KEYBOARD_HOST, /**< Host keyboard layout */
132 ELM_WIN_KEYBOARD_FILE, /**< File keyboard layout */
133 ELM_WIN_KEYBOARD_URL, /**< URL keyboard layout */
134 ELM_WIN_KEYBOARD_KEYPAD, /**< Keypad layout */
135 ELM_WIN_KEYBOARD_J2ME /**< J2ME keyboard layout */
136} Elm_Win_Keyboard_Mode;
137
138/** Define the keygrab modes of window. A window may send commands to the
139 * Keyrouter according this mode, and perform different actions.
140 *
141 * @ingroup Elm_Win
142 */
143typedef enum
144{
145 ELM_WIN_KEYGRAB_UNKNOWN = 0, /**< Unknown keygrab mode */
146 ELM_WIN_KEYGRAB_SHARED = 256 /* 1 >> 8 */, /**< Get the grabbed-key
147 * together with the other
148 * client windows */
149 ELM_WIN_KEYGRAB_TOPMOST = 512 /* 1 >> 9 */, /**< Get the grabbed-key only
150 * when window is top of the
151 * stack */
152 ELM_WIN_KEYGRAB_EXCLUSIVE = 1024 /* 1 >> 10 */, /**< Get the grabbed-key
153 * exclusively regardless
154 * of window's position */
155 ELM_WIN_KEYGRAB_OVERRIDE_EXCLUSIVE = 2048 /* 1 >> 11 */ /**< Get the grabbed-key exclusively
156 * regardless of window's position.
157 * This is overrided by grabs from the
158 * other client window */
159} Elm_Win_Keygrab_Mode;
160
161
162/**
163 * @brief Define the move or resize mode of window.
164 *
165 * The user can request the display server to start moving or resizing the
166 * window by combining these modes. However only limited combinations are
167 * allowed.
168 *
169 * Currently, only the following 9 combinations are permitted. More
170 * combinations may be added in future: 1. move, 2. top, 3. bottom, 4. left, 5.
171 * right, 6. top | left, 7. top | right, 8. bottom | left, 9. bottom | right.
172 *
173 * @since 1.19
174 *
175 * @ingroup Elm_Win
176 */
177typedef enum
178{
179 ELM_WIN_MOVE_RESIZE_MOVE = 1, /**< Start moving window */
180 ELM_WIN_MOVE_RESIZE_TOP = 2 /* 1 >> 1 */, /**< Start resizing window to the
181 * top */
182 ELM_WIN_MOVE_RESIZE_BOTTOM = 4 /* 1 >> 2 */, /**< Start resizing window to
183 * the bottom */
184 ELM_WIN_MOVE_RESIZE_LEFT = 8 /* 1 >> 3 */, /**< Start resizing window to
185 * the left */
186 ELM_WIN_MOVE_RESIZE_RIGHT = 16 /* 1 >> 4 */ /**< Start resizing window to
187 * the right */
188} Elm_Win_Move_Resize_Mode;
189
106 190
107/** 191/**
108 * Adds a window object. If this is the first window created, pass NULL as 192 * Adds a window object. If this is the first window created, pass NULL as
@@ -1264,3 +1348,602 @@ EAPI void elm_win_wm_rotation_available_rotations_set(Elm_Win *obj, const int *r
1264 * @ingroup Efl_Ui_Win 1348 * @ingroup Efl_Ui_Win
1265 */ 1349 */
1266EAPI Eina_Bool elm_win_wm_rotation_available_rotations_get(const Elm_Win *obj, int **rotations, unsigned int *count); 1350EAPI Eina_Bool elm_win_wm_rotation_available_rotations_get(const Elm_Win *obj, int **rotations, unsigned int *count);
1351
1352
1353/**
1354 * @brief Constrain the maximum width and height of a window to the width and
1355 * height of the screen.
1356 *
1357 * When @c constrain is @c true, @c obj will never resize larger than the
1358 * screen.
1359 *
1360 * @param[in] obj The object.
1361 * @param[in] constrain @c true to restrict the window's maximum size.
1362 *
1363 * @ingroup Elm_Win_Group
1364 */
1365EAPI void elm_win_screen_constrain_set(Evas_Object *obj, Eina_Bool constrain);
1366
1367/**
1368 * @brief Get the constraints on the maximum width and height of a window
1369 * relative to the width and height of the screen.
1370 *
1371 * When this function returns @c true, @c obj will never resize larger than the
1372 * screen.
1373 *
1374 * @param[in] obj The object.
1375 *
1376 * @return @c true to restrict the window's maximum size.
1377 *
1378 * @ingroup Elm_Win_Group
1379 */
1380EAPI Eina_Bool elm_win_screen_constrain_get(const Evas_Object *obj);
1381
1382/**
1383 * @brief Set the window to be skipped by keyboard focus.
1384 *
1385 * This sets the window to be skipped by normal keyboard input. This means a
1386 * window manager will be asked not to focus this window as well as omit it
1387 * from things like the taskbar, pager, "alt-tab" list etc. etc.
1388 *
1389 * Call this and enable it on a window BEFORE you show it for the first time,
1390 * otherwise it may have no effect.
1391 *
1392 * Use this for windows that have only output information or might only be
1393 * interacted with by the mouse or touchscreen, never for typing. This may have
1394 * side-effects like making the window non-accessible in some cases unless the
1395 * window is specially handled. Use this with care.
1396 *
1397 * @param[in] obj The object.
1398 * @param[in] skip The skip flag state ($true if it is to be skipped).
1399 *
1400 * @ingroup Elm_Win_Group
1401 */
1402EAPI void elm_win_prop_focus_skip_set(Evas_Object *obj, Eina_Bool skip);
1403
1404/**
1405 * @brief Window's autohide state.
1406 *
1407 * When closing the window in any way outside of the program control, like
1408 * pressing the X button in the titlebar or using a command from the Window
1409 * Manager, a "delete,request" signal is emitted to indicate that this event
1410 * occurred and the developer can take any action, which may include, or not,
1411 * destroying the window object.
1412 *
1413 * When this property is set to @c true, the window will be automatically
1414 * hidden when this event occurs, after the signal is emitted. If this property
1415 * is @c false nothing will happen, beyond the event emission.
1416 *
1417 * C applications can use this option along with the quit policy
1418 * @c ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN which allows exiting EFL's main loop
1419 * when all the windows are hidden.
1420 *
1421 * @note @c autodel and @c autohide are not mutually exclusive. The window will
1422 * be deleted if both are set to @c true.
1423 *
1424 * @param[in] obj The object.
1425 * @param[in] autohide If @c true, the window will automatically hide itself
1426 * when closed.
1427 *
1428 * @ingroup Elm_Win_Group
1429 */
1430EAPI void elm_win_autohide_set(Evas_Object *obj, Eina_Bool autohide);
1431
1432/**
1433 * @brief Window's autohide state.
1434 *
1435 * When closing the window in any way outside of the program control, like
1436 * pressing the X button in the titlebar or using a command from the Window
1437 * Manager, a "delete,request" signal is emitted to indicate that this event
1438 * occurred and the developer can take any action, which may include, or not,
1439 * destroying the window object.
1440 *
1441 * When this property is set to @c true, the window will be automatically
1442 * hidden when this event occurs, after the signal is emitted. If this property
1443 * is @c false nothing will happen, beyond the event emission.
1444 *
1445 * C applications can use this option along with the quit policy
1446 * @c ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN which allows exiting EFL's main loop
1447 * when all the windows are hidden.
1448 *
1449 * @note @c autodel and @c autohide are not mutually exclusive. The window will
1450 * be deleted if both are set to @c true.
1451 *
1452 * @param[in] obj The object.
1453 *
1454 * @return If @c true, the window will automatically hide itself when closed.
1455 *
1456 * @ingroup Elm_Win_Group
1457 */
1458EAPI Eina_Bool elm_win_autohide_get(const Evas_Object *obj);
1459
1460/**
1461 * @brief Set a window object's icon.
1462 *
1463 * This sets an image to be used as the icon for the given window, in the
1464 * window manager decoration part. The exact pixel dimensions of the object
1465 * (not object size) will be used and the image pixels will be used as-is when
1466 * this function is called. If the image object has been updated, then call
1467 * this function again to source the image pixels and place them in the
1468 * window's icon. Note that only objects of type @ref Efl_Canvas_Image or
1469 * @ref Efl_Ui_Image are allowed.
1470 *
1471 * @param[in] obj The object.
1472 * @param[in] icon The image object to use for an icon.
1473 *
1474 * @ingroup Elm_Win_Group
1475 */
1476EAPI void elm_win_icon_object_set(Evas_Object *obj, Evas_Object *icon);
1477
1478/**
1479 * @brief Get the icon object used for the window.
1480 *
1481 * The object returns is the one marked by @ref elm_win_icon_object_set as the
1482 * object to use for the window icon.
1483 *
1484 * @param[in] obj The object.
1485 *
1486 * @return The Evas image object to use for an icon.
1487 *
1488 * @ingroup Elm_Win_Group
1489 */
1490EAPI const Evas_Object *elm_win_icon_object_get(const Evas_Object *obj);
1491
1492/**
1493 * @brief Set the iconified state of a window.
1494 *
1495 * @param[in] obj The object.
1496 * @param[in] iconified If @c true, the window is iconified.
1497 *
1498 * @ingroup Elm_Win_Group
1499 */
1500EAPI void elm_win_iconified_set(Evas_Object *obj, Eina_Bool iconified);
1501
1502/**
1503 * @brief Get the iconified state of a window.
1504 *
1505 * @param[in] obj The object.
1506 *
1507 * @return If @c true, the window is iconified.
1508 *
1509 * @ingroup Elm_Win_Group
1510 */
1511EAPI Eina_Bool elm_win_iconified_get(const Evas_Object *obj);
1512
1513/**
1514 * @brief Set the maximized state of a window.
1515 *
1516 * @param[in] obj The object.
1517 * @param[in] maximized If @c true, the window is maximized.
1518 *
1519 * @ingroup Elm_Win_Group
1520 */
1521EAPI void elm_win_maximized_set(Evas_Object *obj, Eina_Bool maximized);
1522
1523/**
1524 * @brief Get the maximized state of a window.
1525 *
1526 * @param[in] obj The object.
1527 *
1528 * @return If @c true, the window is maximized.
1529 *
1530 * @ingroup Elm_Win_Group
1531 */
1532EAPI Eina_Bool elm_win_maximized_get(const Evas_Object *obj);
1533
1534/**
1535 * @brief Set the fullscreen state of a window.
1536 *
1537 * @param[in] obj The object.
1538 * @param[in] fullscreen If @c true, the window is fullscreen.
1539 *
1540 * @ingroup Elm_Win_Group
1541 */
1542EAPI void elm_win_fullscreen_set(Evas_Object *obj, Eina_Bool fullscreen);
1543
1544/**
1545 * @brief Get the fullscreen state of a window.
1546 *
1547 * @param[in] obj The object.
1548 *
1549 * @return If @c true, the window is fullscreen.
1550 *
1551 * @ingroup Elm_Win_Group
1552 */
1553EAPI Eina_Bool elm_win_fullscreen_get(const Evas_Object *obj);
1554
1555/**
1556 * @brief Set the sticky state of the window.
1557 *
1558 * Hints the Window Manager that the window in @c obj should be left fixed at
1559 * its position even when the virtual desktop it's on moves or changes.
1560 *
1561 * @param[in] obj The object.
1562 * @param[in] sticky If @c true, the window's sticky state is enabled.
1563 *
1564 * @ingroup Elm_Win_Group
1565 */
1566EAPI void elm_win_sticky_set(Evas_Object *obj, Eina_Bool sticky);
1567
1568/**
1569 * @brief Get the sticky state of the window.
1570 *
1571 * @param[in] obj The object.
1572 *
1573 * @return If @c true, the window's sticky state is enabled.
1574 *
1575 * @ingroup Elm_Win_Group
1576 */
1577EAPI Eina_Bool elm_win_sticky_get(const Evas_Object *obj);
1578
1579
1580
1581
1582
1583/**
1584 * @brief Set the noblank property of a window.
1585 *
1586 * The "noblank" property is a way to request the display on which the window
1587 * is shown does not blank, go to screensaver or otherwise hide or obscure the
1588 * window. It is intended for uses such as media playback on a television where
1589 * a user may not want to be interrupted by an idle screen. The noblank
1590 * property may have no effect if the window is iconified/minimized or hidden.
1591 *
1592 * @param[in] obj The object.
1593 * @param[in] noblank If @c true, the window is set to noblank.
1594 *
1595 * @since 1.11
1596 *
1597 * @ingroup Elm_Win_Group
1598 */
1599EAPI void elm_win_noblank_set(Evas_Object *obj, Eina_Bool noblank);
1600
1601/**
1602 * @brief Get the noblank property of a window.
1603 *
1604 * @param[in] obj The object.
1605 *
1606 * @return If @c true, the window is set to noblank.
1607 *
1608 * @since 1.11
1609 *
1610 * @ingroup Elm_Win_Group
1611 */
1612EAPI Eina_Bool elm_win_noblank_get(const Evas_Object *obj);
1613
1614/**
1615 * @brief Set the borderless state of a window.
1616 *
1617 * This function requests the Window Manager not to draw any decoration around
1618 * the window.
1619 *
1620 * @param[in] obj The object.
1621 * @param[in] borderless If @c true, the window is borderless.
1622 *
1623 * @ingroup Elm_Win_Group
1624 */
1625EAPI void elm_win_borderless_set(Evas_Object *obj, Eina_Bool borderless);
1626
1627/**
1628 * @brief Get the borderless state of a window.
1629 *
1630 * @param[in] obj The object.
1631 *
1632 * @return If @c true, the window is borderless.
1633 *
1634 * @ingroup Elm_Win_Group
1635 */
1636EAPI Eina_Bool elm_win_borderless_get(const Evas_Object *obj);
1637
1638/**
1639 * @brief The role of the window.
1640 *
1641 * It is a hint of how the Window Manager should handle it. Unlike
1642 * @ref elm_win_type_get and @ref elm_win_name_get this can be changed at
1643 * runtime.
1644 *
1645 * Set the role of the window.
1646 *
1647 * @param[in] obj The object.
1648 * @param[in] role The role to set.
1649 *
1650 * @ingroup Elm_Win_Group
1651 */
1652EAPI void elm_win_role_set(Evas_Object *obj, const char *role);
1653
1654/**
1655 * @brief The role of the window.
1656 *
1657 * It is a hint of how the Window Manager should handle it. Unlike
1658 * @ref elm_win_type_get and @ref elm_win_name_get this can be changed at
1659 * runtime.
1660 *
1661 * Get the role of the window.
1662 *
1663 * The returned string is an internal one and should not be freed or modified.
1664 * It will also be invalid if a new role is set or if the window is destroyed.
1665 *
1666 * @param[in] obj The object.
1667 *
1668 * @return The role to set.
1669 *
1670 * @ingroup Elm_Win_Group
1671 */
1672EAPI const char *elm_win_role_get(const Evas_Object *obj);
1673
1674
1675/**
1676 * @brief The window name.
1677 *
1678 * The meaning of name depends on the underlying windowing system.
1679 *
1680 * The window name is a construction property that can only be set at creation
1681 * time, before finalize. In C this means inside @c efl_add().
1682 *
1683 * @note Once set, it cannot be modified afterwards.
1684 *
1685 * No description supplied.
1686 *
1687 * @param[in] obj The object.
1688 *
1689 * @return Window name
1690 *
1691 * @since 1.18
1692 *
1693 * @ingroup Elm_Win_Group
1694 */
1695EAPI const char *elm_win_name_get(const Evas_Object *obj);
1696
1697
1698/**
1699 * @brief The type of the window.
1700 *
1701 * It is a hint of how the Window Manager should handle it.
1702 *
1703 * The window type is a construction property that can only be set at creation
1704 * time, before finalize. In C this means inside @c efl_add().
1705 *
1706 * @note Once set, it cannot be modified afterward.
1707 *
1708 * If the object is not window object, returns @c unknown.
1709 *
1710 * @param[in] obj The object.
1711 *
1712 * @return Window type
1713 *
1714 * @ingroup Elm_Win_Group
1715 */
1716EAPI Elm_Win_Type elm_win_type_get(const Evas_Object *obj);
1717
1718
1719/**
1720 * @brief The hardware acceleration preference for this window.
1721 *
1722 * This is a constructor function and can only be called before
1723 * @ref Efl.Object.finalize.
1724 *
1725 * This property overrides the global EFL configuration option
1726 * "accel_preference" for this single window, and accepts the same syntax.
1727 *
1728 * The @c accel string is a freeform C string that indicates what kind of
1729 * acceleration is preferred. Here "acceleration" generally refers to rendering
1730 * and the hardware with which the unit application renders GUIs. This may or
1731 * may not be honored but a best attempt will be made. Known strings are as
1732 * follows:
1733 *
1734 * "gl", "opengl" - try use OpenGL. "3d" - try to use a 3d acceleration unit.
1735 * "hw", "hardware", "accel" - try any acceleration unit (best possible) "none"
1736 * - use no acceleration but software instead (since 1.16)
1737 *
1738 * Since 1.14, it is also possible to specify some GL properties for the GL
1739 * window surface. This allows applications to use GLView with depth, stencil
1740 * and MSAA buffers with direct rendering. The new accel preference string
1741 * format is thus "{HW Accel}[:depth{value}[:stencil{value}[:msaa{str}$]$]$]".
1742 *
1743 * Accepted values for depth are for instance "depth", "depth16", "depth24".
1744 * Accepted values for stencil are "stencil", "stencil1", "stencil8". For MSAA,
1745 * only predefined strings are accepted: "msaa", "msaa_low", "msaa_mid" and
1746 * "msaa_high". The selected configuration is not guaranteed and is only valid
1747 * in case of GL acceleration. Only the base acceleration string will be saved
1748 * (e.g. "gl" or "hw").
1749 *
1750 * Full examples include:
1751 *
1752 * "gl", - try to use OpenGL "hw:depth:stencil", - use HW acceleration with
1753 * default depth and stencil buffers "opengl:depth24:stencil8:msaa_mid" - use
1754 * OpenGL with 24-bit depth, 8-bit stencil and a medium number of MSAA samples
1755 * in the backbuffer.
1756 *
1757 * Note that this option may be overriden by environment variables or the
1758 * configuration option "accel_preference_override".
1759 *
1760 * This will return the value of "accel_preference" when the window was
1761 * created.
1762 *
1763 * @param[in] obj The object.
1764 *
1765 * @return Acceleration
1766 *
1767 * @since 1.18
1768 *
1769 * @ingroup Elm_Win_Group
1770 */
1771EAPI const char *elm_win_accel_preference_get(const Evas_Object *obj);
1772
1773/**
1774 * @brief Set the alpha channel state of a window.
1775 *
1776 * If @c alpha is true, the alpha channel of the canvas will be enabled
1777 * possibly making parts of the window completely or partially transparent.
1778 * This is also subject to the underlying system supporting it, for example a
1779 * system using a compositing manager.
1780 *
1781 * @note Alpha window can be enabled automatically by window theme style's
1782 * property. If "alpha" data.item is "1" or "true" in window style(eg.
1783 * elm/win/base/default), the window is switched to alpha automatically without
1784 * the explicit api call.
1785 *
1786 * @param[in] obj The object.
1787 * @param[in] alpha @c true if the window alpha channel is enabled, @c false
1788 * otherwise.
1789 *
1790 * @ingroup Elm_Win_Group
1791 */
1792EAPI void elm_win_alpha_set(Evas_Object *obj, Eina_Bool alpha);
1793
1794/**
1795 * @brief Get the alpha channel state of a window.
1796 *
1797 * @param[in] obj The object.
1798 *
1799 * @return @c true if the window alpha channel is enabled, @c false otherwise.
1800 *
1801 * @ingroup Elm_Win_Group
1802 */
1803EAPI Eina_Bool elm_win_alpha_get(const Evas_Object *obj);
1804
1805/**
1806 * @brief Activate a window object.
1807 *
1808 * This function sends a request to the Window Manager to activate the window
1809 * pointed by @c obj. If honored by the WM, the window will receive the
1810 * keyboard focus.
1811 *
1812 * @note This is just a request that a Window Manager may ignore, so calling
1813 * this function does not ensure in any way that the window will be the active
1814 * one afterwards.
1815 * @param[in] obj The object.
1816 *
1817 * @ingroup Elm_Win_Group
1818 */
1819EAPI void elm_win_activate(Evas_Object *obj);
1820
1821/**
1822 * @brief Center a window on the screen.
1823 *
1824 * This function centers window @c obj horizontally and/or vertically based on
1825 * the values of @c h and @c v.
1826 *
1827 * @note This is just a request that a Window Manager may ignore, so calling
1828 * this function does not ensure in any way that the window will be centered
1829 * afterwards.
1830 *
1831 * @param[in] obj The object.
1832 * @param[in] h If @c true, center horizontally. If @c false, do not change
1833 * horizontal location.
1834 * @param[in] v If @c true, center vertically. If @c false, do not change
1835 * vertical location.
1836 *
1837 * @ingroup Elm_Win_Group
1838 */
1839EAPI void elm_win_center(Evas_Object *obj, Eina_Bool h, Eina_Bool v);
1840
1841
1842
1843/**
1844 * @brief Start moving or resizing the window.
1845 *
1846 * The user can request the display server to start moving or resizing the
1847 * window by combining modes from @ref Efl_Ui_Win_Move_Resize_Mode. This API
1848 * can only be called if none of the following conditions is true:
1849 *
1850 * 1. Called in the absence of a pointer down event, 2. Called more than once
1851 * before a pointer up event, 3. Called when the window is already being
1852 * resized or moved, 4. Called with an unsupported combination of modes.
1853 *
1854 * Right usage: 1. Pointer (mouse or touch) down event, 2.
1855 * @ref elm_win_move_resize_start called only once with a supported mode, 3.
1856 * Pointer (mouse or touch) up event.
1857 *
1858 * If a pointer up event occurs after calling the function, it automatically
1859 * ends the window move and resize operation.
1860 *
1861 * Currently, only the following 9 combinations are allowed, and possibly more
1862 * combinations may be added in the future: 1. @ref ELM_WIN_MOVE_RESIZE_MOVE
1863 * 2. @ref ELM_WIN_MOVE_RESIZE_TOP 3. @ref ELM_WIN_MOVE_RESIZE_BOTTOM 4.
1864 * @ref ELM_WIN_MOVE_RESIZE_LEFT 5. @ref ELM_WIN_MOVE_RESIZE_RIGHT 6.
1865 * @ref ELM_WIN_MOVE_RESIZE_TOP | @ref ELM_WIN_MOVE_RESIZE_LEFT 7.
1866 * @ref ELM_WIN_MOVE_RESIZE_TOP | @ref ELM_WIN_MOVE_RESIZE_RIGHT 8.
1867 * @ref ELM_WIN_MOVE_RESIZE_BOTTOM | @ref ELM_WIN_MOVE_RESIZE_LEFT 9.
1868 * @ref ELM_WIN_MOVE_RESIZE_BOTTOM | @ref ELM_WIN_MOVE_RESIZE_RIGHT
1869 *
1870 * In particular move and resize cannot happen simultaneously.
1871 *
1872 * @note the result of this API can only guarantee that the request has been
1873 * forwarded to the server, but there is no guarantee that the request can be
1874 * processed by the display server.
1875 *
1876 * @param[in] obj The object.
1877 * @param[in] mode The requested move or resize mode.
1878 *
1879 * @return @c true if the request was successfully sent to the display server,
1880 * @c false in case of error.
1881 *
1882 * @since 1.19
1883 *
1884 * @ingroup Elm_Win_Group
1885 */
1886EAPI Eina_Bool elm_win_move_resize_start(Evas_Object *obj, Elm_Win_Move_Resize_Mode mode);
1887
1888/**
1889 * @brief Set the animate status for the focus highlight for this window.
1890 *
1891 * This function will enable or disable the animation of focus highlight only
1892 * for the given window, regardless of the global setting for it.
1893 *
1894 * @param[in] animate The enabled value for the highlight animation.
1895 *
1896 * @ingroup Elm_Win
1897 */
1898EAPI void elm_win_focus_highlight_animate_set(Elm_Win *obj, Eina_Bool animate);
1899
1900/**
1901 * @brief Get the animate value of the focus highlight for this window.
1902 *
1903 * @return The enabled value for the highlight animation.
1904 *
1905 * @ingroup Elm_Win
1906 */
1907EAPI Eina_Bool elm_win_focus_highlight_animate_get(const Elm_Win *obj);
1908
1909/**
1910 * @brief Set the enabled status for the focus highlight in a window.
1911 *
1912 * This function will enable or disable the focus highlight only for the given
1913 * window, regardless of the global setting for it.
1914 *
1915 * @param[in] enabled The enabled value for the highlight.
1916 *
1917 * @ingroup Elm_Win
1918 */
1919EAPI void elm_win_focus_highlight_enabled_set(Elm_Win *obj, Eina_Bool enabled);
1920
1921/**
1922 * @brief Get the enabled value of the focus highlight for this window.
1923 *
1924 * @return The enabled value for the highlight.
1925 *
1926 * @ingroup Elm_Win
1927 */
1928EAPI Eina_Bool elm_win_focus_highlight_enabled_get(const Elm_Win *obj);
1929
1930/**
1931 * @brief Set the style for the focus highlight on this window.
1932 *
1933 * Sets the style to use for theming the highlight of focused objects on the
1934 * given window. If @c style is NULL, the default will be used.
1935 *
1936 * @param[in] style The style or @c null if none.
1937 *
1938 * @ingroup Elm_Win
1939 */
1940EAPI Eina_Bool elm_win_focus_highlight_style_set(Elm_Win *obj, const char *style);
1941
1942/**
1943 * @brief Get the style set for the focus highlight object.
1944 *
1945 * @return The style or @c null if none.
1946 *
1947 * @ingroup Elm_Win
1948 */
1949EAPI const char *elm_win_focus_highlight_style_get(const Elm_Win *obj);
diff --git a/src/tests/elementary/efl_ui_test_image.c b/src/tests/elementary/efl_ui_test_image.c
index 6c5e9f8bb5..244f1047e4 100644
--- a/src/tests/elementary/efl_ui_test_image.c
+++ b/src/tests/elementary/efl_ui_test_image.c
@@ -13,7 +13,7 @@ EFL_START_TEST(efl_ui_image_test_icon)
13 Eina_Bool ok; 13 Eina_Bool ok;
14 const char *icon_name; 14 const char *icon_name;
15 15
16 win = win_add(NULL, "image", EFL_UI_WIN_BASIC); 16 win = win_add(NULL, "image", EFL_UI_WIN_TYPE_BASIC);
17 17
18 image = efl_add(EFL_UI_IMAGE_CLASS, win); 18 image = efl_add(EFL_UI_IMAGE_CLASS, win);
19 efl_gfx_entity_visible_set(image, EINA_TRUE); 19 efl_gfx_entity_visible_set(image, EINA_TRUE);
diff --git a/src/tests/elementary/efl_ui_test_image_zoomable.c b/src/tests/elementary/efl_ui_test_image_zoomable.c
index cbb16ad169..d9d9e1032c 100644
--- a/src/tests/elementary/efl_ui_test_image_zoomable.c
+++ b/src/tests/elementary/efl_ui_test_image_zoomable.c
@@ -13,7 +13,7 @@ EFL_START_TEST(efl_ui_test_image_zoomable_icon)
13 Eina_Bool ok; 13 Eina_Bool ok;
14 const char *icon_name; 14 const char *icon_name;
15 15
16 win = win_add(NULL, "photocam", EFL_UI_WIN_BASIC); 16 win = win_add(NULL, "photocam", EFL_UI_WIN_TYPE_BASIC);
17 17
18 img_zoomable = efl_add(EFL_UI_IMAGE_ZOOMABLE_CLASS, win); 18 img_zoomable = efl_add(EFL_UI_IMAGE_ZOOMABLE_CLASS, win);
19 efl_gfx_entity_visible_set(img_zoomable, EINA_TRUE); 19 efl_gfx_entity_visible_set(img_zoomable, EINA_TRUE);
diff --git a/src/tests/elementary/efl_ui_test_layout.c b/src/tests/elementary/efl_ui_test_layout.c
index 7aac2adc54..8f52408cc4 100644
--- a/src/tests/elementary/efl_ui_test_layout.c
+++ b/src/tests/elementary/efl_ui_test_layout.c
@@ -28,7 +28,7 @@ EFL_START_TEST(efl_ui_layout_test_property_bind)
28 const char *part_text; 28 const char *part_text;
29 const char text_value[] = "A random string for elm_layout_property_bind test"; 29 const char text_value[] = "A random string for elm_layout_property_bind test";
30 30
31 win = win_add(NULL, "layout", EFL_UI_WIN_BASIC); 31 win = win_add(NULL, "layout", EFL_UI_WIN_TYPE_BASIC);
32 32
33 ly = efl_add(EFL_UI_LAYOUT_CLASS, win); 33 ly = efl_add(EFL_UI_LAYOUT_CLASS, win);
34 snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR); 34 snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR);
@@ -58,7 +58,7 @@ EFL_START_TEST(efl_ui_layout_test_layout_api_size_min)
58 Evas_Object *win; 58 Evas_Object *win;
59 Eina_Size2D res; 59 Eina_Size2D res;
60 60
61 win = win_add(NULL, "layout", EFL_UI_WIN_BASIC); 61 win = win_add(NULL, "layout", EFL_UI_WIN_TYPE_BASIC);
62 /* this is just a test to not get segfaults in those calls */ 62 /* this is just a test to not get segfaults in those calls */
63 Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win); 63 Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win);
64 res = efl_layout_calc_size_min(layout, EINA_SIZE2D(2, 2)); 64 res = efl_layout_calc_size_min(layout, EINA_SIZE2D(2, 2));
@@ -71,7 +71,7 @@ EFL_START_TEST(efl_ui_layout_test_layout_api_update_hints)
71{ 71{
72 Evas_Object *win; 72 Evas_Object *win;
73 73
74 win = win_add(NULL, "layout", EFL_UI_WIN_BASIC); 74 win = win_add(NULL, "layout", EFL_UI_WIN_TYPE_BASIC);
75 /* this is just a test to not get segfaults in those calls */ 75 /* this is just a test to not get segfaults in those calls */
76 Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win); 76 Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win);
77 efl_layout_calc_auto_update_hints_set(layout, EINA_TRUE); 77 efl_layout_calc_auto_update_hints_set(layout, EINA_TRUE);
@@ -83,7 +83,7 @@ EFL_START_TEST(efl_ui_layout_test_layout_force)
83{ 83{
84 Evas_Object *win; 84 Evas_Object *win;
85 85
86 win = win_add(NULL, "layout", EFL_UI_WIN_BASIC); 86 win = win_add(NULL, "layout", EFL_UI_WIN_TYPE_BASIC);
87 /* this is just a test to not get segfaults in those calls */ 87 /* this is just a test to not get segfaults in those calls */
88 Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win); 88 Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win);
89 efl_layout_calc_force(layout); 89 efl_layout_calc_force(layout);
@@ -95,7 +95,7 @@ EFL_START_TEST(efl_ui_layout_test_layout_theme)
95 Evas_Object *win; 95 Evas_Object *win;
96 const char *klass, *group, *style; 96 const char *klass, *group, *style;
97 97
98 win = win_add(NULL, "layout", EFL_UI_WIN_BASIC); 98 win = win_add(NULL, "layout", EFL_UI_WIN_TYPE_BASIC);
99 Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win, 99 Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win,
100 efl_ui_layout_theme_set(efl_added, "win", "background", NULL) 100 efl_ui_layout_theme_set(efl_added, "win", "background", NULL)
101 ); 101 );
diff --git a/src/tests/elementary/efl_ui_test_relative_layout.c b/src/tests/elementary/efl_ui_test_relative_layout.c
index 0471154338..540e77fa11 100644
--- a/src/tests/elementary/efl_ui_test_relative_layout.c
+++ b/src/tests/elementary/efl_ui_test_relative_layout.c
@@ -209,7 +209,7 @@ static void
209layout_setup() 209layout_setup()
210{ 210{
211 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 211 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
212 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC)); 212 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC));
213 213
214 layout = efl_add(EFL_UI_RELATIVE_LAYOUT_CLASS, win, 214 layout = efl_add(EFL_UI_RELATIVE_LAYOUT_CLASS, win,
215 efl_gfx_entity_size_set(efl_added, EINA_SIZE2D(200, 200))); 215 efl_gfx_entity_size_set(efl_added, EINA_SIZE2D(200, 200)));
diff --git a/src/tests/elementary/efl_ui_test_widget.c b/src/tests/elementary/efl_ui_test_widget.c
index 89a429b406..ad1a60fa0e 100644
--- a/src/tests/elementary/efl_ui_test_widget.c
+++ b/src/tests/elementary/efl_ui_test_widget.c
@@ -18,7 +18,7 @@ static void
18_small_ui(State *s) 18_small_ui(State *s)
19{ 19{
20 s->win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 20 s->win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
21 efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), 21 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
22 efl_text_set(efl_added, "Hello World")); 22 efl_text_set(efl_added, "Hello World"));
23 23
24 s->ic = efl_add(EFL_UI_IMAGE_CLASS, s->win, 24 s->ic = efl_add(EFL_UI_IMAGE_CLASS, s->win,
diff --git a/src/tests/elementary/suite_helpers.c b/src/tests/elementary/suite_helpers.c
index 50208b79ec..682a30753e 100644
--- a/src/tests/elementary/suite_helpers.c
+++ b/src/tests/elementary/suite_helpers.c
@@ -181,7 +181,7 @@ _elm_suite_win_create()
181 if (legacy_mode) 181 if (legacy_mode)
182 win = elm_win_add(NULL, "elm_suite", ELM_WIN_BASIC); 182 win = elm_win_add(NULL, "elm_suite", ELM_WIN_BASIC);
183 else 183 else
184 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC)); 184 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC));
185 if (!buffer) return win; 185 if (!buffer) return win;
186 loop = efl_add(efl_loop_realized_class_get(), win); 186 loop = efl_add(efl_loop_realized_class_get(), win);
187 timer = efl_add(EFL_LOOP_TIMER_CLASS, loop, 187 timer = efl_add(EFL_LOOP_TIMER_CLASS, loop,