summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2019-07-04 16:02:43 -0700
committerXavi Artigas <xavierartigas@yahoo.es>2019-07-05 19:18:22 +0200
commit47c5736ef9198c2b41d98ade601114f329b69b24 (patch)
treedd2a65058a99fbb20ded3ba222cd733cb93c6579
parentfaaba156ab35c32a740f3847cd592cd21424ff25 (diff)
elementary: rename Activew_View to Spotlight.
View is something that is expected in the context of MVVM, so using it somewhere else is going to lead to some confusion. Spotlight does descrive the objective of all of this widget in actually a more explicit way as they all give the spotlight to one sub widget at a time. I have also renamed the View_Manager to be just Manager as the View there wasn't useful.
-rw-r--r--src/bin/elementary/meson.build2
-rw-r--r--src/bin/elementary/test.c14
-rw-r--r--src/bin/elementary/test_ui_spotlight.c (renamed from src/bin/elementary/test_ui_active_view.c)208
-rw-r--r--src/bin/elementary/test_ui_stack.c12
-rw-r--r--src/bin/elementary/test_ui_tab_pager.c28
-rw-r--r--src/examples/elementary/efl_ui_slideshow_example.c14
-rw-r--r--src/lib/elementary/Efl_Ui.h24
-rw-r--r--src/lib/elementary/efl_ui_active_view_container.eo111
-rw-r--r--src/lib/elementary/efl_ui_active_view_indicator_icon.eo8
-rw-r--r--src/lib/elementary/efl_ui_active_view_util.c21
-rw-r--r--src/lib/elementary/efl_ui_active_view_view_manager_plain.eo12
-rw-r--r--src/lib/elementary/efl_ui_active_view_view_manager_scroll.eo12
-rw-r--r--src/lib/elementary/efl_ui_active_view_view_manager_stack.eo12
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.c8
-rw-r--r--src/lib/elementary/efl_ui_spotlight_container.c (renamed from src/lib/elementary/efl_ui_active_view_container.c)212
-rw-r--r--src/lib/elementary/efl_ui_spotlight_container.eo111
-rw-r--r--src/lib/elementary/efl_ui_spotlight_indicator.c (renamed from src/lib/elementary/efl_ui_active_view_indicator.c)4
-rw-r--r--src/lib/elementary/efl_ui_spotlight_indicator.eo (renamed from src/lib/elementary/efl_ui_active_view_indicator.eo)18
-rw-r--r--src/lib/elementary/efl_ui_spotlight_indicator_icon.c (renamed from src/lib/elementary/efl_ui_active_view_indicator_icon.c)24
-rw-r--r--src/lib/elementary/efl_ui_spotlight_indicator_icon.eo8
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager.c (renamed from src/lib/elementary/efl_ui_active_view_view_manager.c)4
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager.eo (renamed from src/lib/elementary/efl_ui_active_view_view_manager.eo)36
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager_plain.c (renamed from src/lib/elementary/efl_ui_active_view_view_manager_plain.c)48
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager_plain.eo12
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager_scroll.c (renamed from src/lib/elementary/efl_ui_active_view_view_manager_scroll.c)56
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager_scroll.eo12
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager_stack.c (renamed from src/lib/elementary/efl_ui_active_view_view_manager_stack.c)48
-rw-r--r--src/lib/elementary/efl_ui_spotlight_manager_stack.eo12
-rw-r--r--src/lib/elementary/efl_ui_spotlight_util.c21
-rw-r--r--src/lib/elementary/efl_ui_spotlight_util.eo (renamed from src/lib/elementary/efl_ui_active_view_util.eo)4
-rw-r--r--src/lib/elementary/efl_ui_tab_pager.c8
-rw-r--r--src/lib/elementary/efl_ui_tab_pager.eo4
-rw-r--r--src/lib/elementary/meson.build32
-rw-r--r--src/tests/elementary/efl_ui_suite.c2
-rw-r--r--src/tests/elementary/efl_ui_suite.h2
-rw-r--r--src/tests/elementary/efl_ui_test_spotlight.c (renamed from src/tests/elementary/efl_ui_test_active_view.c)230
-rw-r--r--src/tests/elementary/meson.build2
-rw-r--r--src/tests/elementary/spec/efl_test_pack_linear.c2
38 files changed, 699 insertions, 699 deletions
diff --git a/src/bin/elementary/meson.build b/src/bin/elementary/meson.build
index 8783cb3086..96b6e906a0 100644
--- a/src/bin/elementary/meson.build
+++ b/src/bin/elementary/meson.build
@@ -98,7 +98,7 @@ elementary_test_src = [
98 'test_panes.c', 98 'test_panes.c',
99 'test_ui_panes.c', 99 'test_ui_panes.c',
100 'test_ui_panel.c', 100 'test_ui_panel.c',
101 'test_ui_active_view.c', 101 'test_ui_spotlight.c',
102 'test_ui_radio.c', 102 'test_ui_radio.c',
103 'test_part_bg.c', 103 'test_part_bg.c',
104 'test_part_shadow.c', 104 'test_part_shadow.c',
diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index 1ea5799543..3835a63797 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -386,9 +386,9 @@ void test_efl_anim_interpolator(void *data, Evas_Object *obj, void *event_info);
386void test_gesture_framework(void *data, Evas_Object *obj, void *event_info); 386void test_gesture_framework(void *data, Evas_Object *obj, void *event_info);
387 387
388void test_ui_tab_pager(void *data, Evas_Object *obj, void *event_info); 388void test_ui_tab_pager(void *data, Evas_Object *obj, void *event_info);
389void test_ui_active_view_stack(void *data, Evas_Object *obj, void *event_info); 389void test_ui_spotlight_stack(void *data, Evas_Object *obj, void *event_info);
390void test_ui_active_view_plain(void *data, Evas_Object *obj, void *event_info); 390void test_ui_spotlight_plain(void *data, Evas_Object *obj, void *event_info);
391void test_ui_active_view_scroll(void *data, Evas_Object *obj, void *event_info); 391void test_ui_spotlight_scroll(void *data, Evas_Object *obj, void *event_info);
392 392
393void test_ui_relative_layout(void *data, Evas_Object *obj, void *event_info); 393void test_ui_relative_layout(void *data, Evas_Object *obj, void *event_info);
394void test_efl_ui_radio(void *data, Evas_Object *obj, void *event_info); 394void test_efl_ui_radio(void *data, Evas_Object *obj, void *event_info);
@@ -1117,10 +1117,10 @@ add_tests:
1117 1117
1118 //------------------------------// 1118 //------------------------------//
1119 ADD_TEST_EO(NULL, "Tab Pager", "Efl.Ui.Tab_Pager", test_ui_tab_pager); 1119 ADD_TEST_EO(NULL, "Tab Pager", "Efl.Ui.Tab_Pager", test_ui_tab_pager);
1120 ADD_TEST_EO(NULL, "Active View", "Efl.Ui.Active_View Plain", test_ui_active_view_plain); 1120 ADD_TEST_EO(NULL, "Spotlight", "Efl.Ui.Spotlight Plain", test_ui_spotlight_plain);
1121 ADD_TEST_EO(NULL, "Active View", "Efl.Ui.Active_View Scroll", test_ui_active_view_scroll); 1121 ADD_TEST_EO(NULL, "Spotlight", "Efl.Ui.Spotlight Scroll", test_ui_spotlight_scroll);
1122 ADD_TEST_EO(NULL, "Active View", "Efl.Ui.Active_View Stack", test_ui_active_view_stack); 1122 ADD_TEST_EO(NULL, "Spotlight", "Efl.Ui.Spotlight Stack", test_ui_spotlight_stack);
1123 ADD_TEST_EO(NULL, "Active View", "Navigation stack", test_ui_stack); 1123 ADD_TEST_EO(NULL, "Spotlight", "Navigation stack", test_ui_stack);
1124 //------------------------------// 1124 //------------------------------//
1125 ADD_TEST(NULL, "Popups", "Ctxpopup", test_ctxpopup); 1125 ADD_TEST(NULL, "Popups", "Ctxpopup", test_ctxpopup);
1126 ADD_TEST(NULL, "Popups", "Hover", test_hover); 1126 ADD_TEST(NULL, "Popups", "Hover", test_hover);
diff --git a/src/bin/elementary/test_ui_active_view.c b/src/bin/elementary/test_ui_spotlight.c
index 62ae450fa9..d7df562087 100644
--- a/src/bin/elementary/test_ui_active_view.c
+++ b/src/bin/elementary/test_ui_spotlight.c
@@ -28,7 +28,7 @@ typedef enum _Pack_Type
28typedef struct _Params 28typedef struct _Params
29{ 29{
30 Evas_Object *navi; 30 Evas_Object *navi;
31 Eo *active_view; 31 Eo *spotlight;
32 Eo *indicator; 32 Eo *indicator;
33 int w, h; 33 int w, h;
34 Eina_Bool wfill, hfill; 34 Eina_Bool wfill, hfill;
@@ -36,14 +36,14 @@ typedef struct _Params
36 36
37typedef struct _Page_Set_Params 37typedef struct _Page_Set_Params
38{ 38{
39 Eo *active_view; 39 Eo *spotlight;
40 Eo *spinner; 40 Eo *spinner;
41} Page_Set_Params; 41} Page_Set_Params;
42 42
43typedef struct _Pack_Params 43typedef struct _Pack_Params
44{ 44{
45 Pack_Type type; 45 Pack_Type type;
46 Eo *active_view; 46 Eo *spotlight;
47 Eo *pack_sp; 47 Eo *pack_sp;
48 Eo *unpack_sp; 48 Eo *unpack_sp;
49 Eo *unpack_btn; 49 Eo *unpack_btn;
@@ -51,7 +51,7 @@ typedef struct _Pack_Params
51 51
52typedef struct _Size_Params 52typedef struct _Size_Params
53{ 53{
54 Eo *active_view; 54 Eo *spotlight;
55 Eo *slider; 55 Eo *slider;
56 Params *params; 56 Params *params;
57} Size_Params; 57} Size_Params;
@@ -116,21 +116,21 @@ view_add(View_Type p, Eo *parent)
116static void 116static void
117prev_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) 117prev_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
118{ 118{
119 Eo *active_view = data; 119 Eo *spotlight = data;
120 int active_index = efl_ui_active_view_active_index_get(active_view); 120 int active_index = efl_ui_spotlight_active_index_get(spotlight);
121 121
122 if (active_index - 1 > -1) 122 if (active_index - 1 > -1)
123 efl_ui_active_view_active_index_set(active_view, active_index - 1); 123 efl_ui_spotlight_active_index_set(spotlight, active_index - 1);
124} 124}
125 125
126static void 126static void
127next_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) 127next_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
128{ 128{
129 Eo *active_view = data; 129 Eo *spotlight = data;
130 int active_index = efl_ui_active_view_active_index_get(active_view); 130 int active_index = efl_ui_spotlight_active_index_get(spotlight);
131 131
132 if (active_index + 1 < efl_content_count(active_view)) 132 if (active_index + 1 < efl_content_count(spotlight))
133 efl_ui_active_view_active_index_set(active_view, active_index + 1); 133 efl_ui_spotlight_active_index_set(spotlight, active_index + 1);
134} 134}
135 135
136static void 136static void
@@ -155,7 +155,7 @@ width_slider_cb(void *data, const Efl_Event *ev)
155 else h = params->h; 155 else h = params->h;
156 156
157 params->w = efl_ui_range_value_get(ev->object); 157 params->w = efl_ui_range_value_get(ev->object);
158 efl_ui_active_view_size_set(params->active_view, EINA_SIZE2D(params->w, h)); 158 efl_ui_spotlight_size_set(params->spotlight, EINA_SIZE2D(params->w, h));
159} 159}
160 160
161static void 161static void
@@ -168,7 +168,7 @@ height_slider_cb(void *data, const Efl_Event *ev)
168 else w = params->w; 168 else w = params->w;
169 169
170 params->h = efl_ui_range_value_get(ev->object); 170 params->h = efl_ui_range_value_get(ev->object);
171 efl_ui_active_view_size_set(params->active_view, EINA_SIZE2D(w, params->h)); 171 efl_ui_spotlight_size_set(params->spotlight, EINA_SIZE2D(w, params->h));
172} 172}
173 173
174static void 174static void
@@ -188,7 +188,7 @@ width_check_cb(void *data, const Efl_Event *ev)
188 if (params->params->hfill) h = -1; 188 if (params->params->hfill) h = -1;
189 else h = params->params->h; 189 else h = params->params->h;
190 190
191 efl_ui_active_view_size_set(params->active_view, EINA_SIZE2D(w, h)); 191 efl_ui_spotlight_size_set(params->spotlight, EINA_SIZE2D(w, h));
192} 192}
193 193
194static void 194static void
@@ -208,7 +208,7 @@ height_check_cb(void *data, const Efl_Event *ev)
208 if (params->params->hfill) h = -1; 208 if (params->params->hfill) h = -1;
209 else h = params->params->h; 209 else h = params->params->h;
210 210
211 efl_ui_active_view_size_set(params->active_view, EINA_SIZE2D(w, h)); 211 efl_ui_spotlight_size_set(params->spotlight, EINA_SIZE2D(w, h));
212} 212}
213 213
214static void 214static void
@@ -221,30 +221,30 @@ static void
221pack_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) 221pack_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
222{ 222{
223 Pack_Params *param = data; 223 Pack_Params *param = data;
224 Eo *active_view = param->active_view; 224 Eo *spotlight = param->spotlight;
225 Eo *page = NULL, *curr_page; 225 Eo *page = NULL, *curr_page;
226 int index, cnt; 226 int index, cnt;
227 227
228 if ((param->type != UNPACK_AT) && (param->type != CLEAR)) 228 if ((param->type != UNPACK_AT) && (param->type != CLEAR))
229 { 229 {
230 index = efl_content_count(active_view); 230 index = efl_content_count(spotlight);
231 231
232 switch (index % 3) 232 switch (index % 3)
233 { 233 {
234 case 0: 234 case 0:
235 page = view_add(LAYOUT, active_view); 235 page = view_add(LAYOUT, spotlight);
236 break; 236 break;
237 237
238 case 1: 238 case 1:
239 page = view_add(LIST, active_view); 239 page = view_add(LIST, spotlight);
240 break; 240 break;
241 241
242 case 2: 242 case 2:
243 page = view_add(BUTTON, active_view); 243 page = view_add(BUTTON, spotlight);
244 break; 244 break;
245 245
246 default: 246 default:
247 page = view_add(LAYOUT, active_view); 247 page = view_add(LAYOUT, spotlight);
248 break; 248 break;
249 } 249 }
250 } 250 }
@@ -252,42 +252,42 @@ pack_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
252 switch (param->type) 252 switch (param->type)
253 { 253 {
254 case PACK_BEGIN: 254 case PACK_BEGIN:
255 efl_pack_begin(active_view, page); 255 efl_pack_begin(spotlight, page);
256 break; 256 break;
257 257
258 case PACK_END: 258 case PACK_END:
259 efl_pack_end(active_view, page); 259 efl_pack_end(spotlight, page);
260 break; 260 break;
261 261
262 case PACK_BEFORE: 262 case PACK_BEFORE:
263 index = efl_ui_active_view_active_index_get(active_view); 263 index = efl_ui_spotlight_active_index_get(spotlight);
264 curr_page = efl_pack_content_get(active_view, index); 264 curr_page = efl_pack_content_get(spotlight, index);
265 efl_pack_before(active_view, page, curr_page); 265 efl_pack_before(spotlight, page, curr_page);
266 break; 266 break;
267 267
268 case PACK_AFTER: 268 case PACK_AFTER:
269 index = efl_ui_active_view_active_index_get(active_view); 269 index = efl_ui_spotlight_active_index_get(spotlight);
270 curr_page = efl_pack_content_get(active_view, index); 270 curr_page = efl_pack_content_get(spotlight, index);
271 efl_pack_after(active_view, page, curr_page); 271 efl_pack_after(spotlight, page, curr_page);
272 break; 272 break;
273 273
274 case PACK_AT: 274 case PACK_AT:
275 index = efl_ui_range_value_get(param->pack_sp); 275 index = efl_ui_range_value_get(param->pack_sp);
276 efl_pack_at(active_view, page, index); 276 efl_pack_at(spotlight, page, index);
277 break; 277 break;
278 278
279 case UNPACK_AT: 279 case UNPACK_AT:
280 index = efl_ui_range_value_get(param->unpack_sp); 280 index = efl_ui_range_value_get(param->unpack_sp);
281 page = efl_pack_unpack_at(active_view, index); 281 page = efl_pack_unpack_at(spotlight, index);
282 efl_del(page); 282 efl_del(page);
283 break; 283 break;
284 284
285 case CLEAR: 285 case CLEAR:
286 efl_pack_clear(active_view); 286 efl_pack_clear(spotlight);
287 break; 287 break;
288 } 288 }
289 289
290 cnt = efl_content_count(active_view); 290 cnt = efl_content_count(spotlight);
291 291
292 index = efl_ui_range_value_get(param->pack_sp); 292 index = efl_ui_range_value_get(param->pack_sp);
293 if (index > cnt) 293 if (index > cnt)
@@ -323,7 +323,7 @@ page_set_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
323{ 323{
324 Page_Set_Params *psp = data; 324 Page_Set_Params *psp = data;
325 325
326 efl_ui_active_view_active_index_set(psp->active_view, 326 efl_ui_spotlight_active_index_set(psp->spotlight,
327 efl_ui_range_value_get(psp->spinner)); 327 efl_ui_range_value_get(psp->spinner));
328} 328}
329 329
@@ -338,19 +338,19 @@ indicator_icon_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
338{ 338{
339 Params *params = data; 339 Params *params = data;
340 340
341 params->indicator = efl_add(EFL_UI_ACTIVE_VIEW_INDICATOR_ICON_CLASS, params->active_view); 341 params->indicator = efl_add(EFL_UI_SPOTLIGHT_INDICATOR_ICON_CLASS, params->spotlight);
342 efl_ui_active_view_indicator_set(params->active_view, params->indicator); 342 efl_ui_spotlight_indicator_set(params->spotlight, params->indicator);
343} 343}
344 344
345static void 345static void
346indicator_none_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) 346indicator_none_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
347{ 347{
348 Params *params = data; 348 Params *params = data;
349 efl_ui_active_view_indicator_set(params->active_view, NULL); 349 efl_ui_spotlight_indicator_set(params->spotlight, NULL);
350} 350}
351 351
352static void 352static void
353active_view_size(void *data, 353spotlight_size(void *data,
354 Evas_Object *obj EINA_UNUSED, 354 Evas_Object *obj EINA_UNUSED,
355 void *event_info EINA_UNUSED) 355 void *event_info EINA_UNUSED)
356{ 356{
@@ -396,7 +396,7 @@ active_view_size(void *data,
396 if (!size_params) return; 396 if (!size_params) return;
397 397
398 size_params->slider = sl; 398 size_params->slider = sl;
399 size_params->active_view = params->active_view; 399 size_params->spotlight = params->spotlight;
400 size_params->params = params; 400 size_params->params = params;
401 401
402 efl_event_callback_add(ck, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, width_check_cb, 402 efl_event_callback_add(ck, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, width_check_cb,
@@ -437,7 +437,7 @@ active_view_size(void *data,
437 if (!size_params) return; 437 if (!size_params) return;
438 438
439 size_params->slider = sl; 439 size_params->slider = sl;
440 size_params->active_view = params->active_view; 440 size_params->spotlight = params->spotlight;
441 size_params->params = params; 441 size_params->params = params;
442 442
443 efl_event_callback_add(ck, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, height_check_cb, 443 efl_event_callback_add(ck, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, height_check_cb,
@@ -456,7 +456,7 @@ _animation_cb(void *data, const Efl_Event *ev)
456{ 456{
457 Params *params = data; 457 Params *params = data;
458 458
459 efl_ui_active_view_view_manager_animation_enabled_set(efl_ui_active_view_manager_get(params->active_view), efl_ui_check_selected_get(ev->object)); 459 efl_ui_spotlight_manager_animation_enabled_set(efl_ui_spotlight_manager_get(params->spotlight), efl_ui_check_selected_get(ev->object));
460} 460}
461 461
462static void 462static void
@@ -479,7 +479,7 @@ view_animation_cb(void *data,
479 479
480 ck = efl_add(EFL_UI_CHECK_CLASS, box); 480 ck = efl_add(EFL_UI_CHECK_CLASS, box);
481 efl_event_callback_add(ck, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _animation_cb, params); 481 efl_event_callback_add(ck, EFL_UI_CHECK_EVENT_SELECTED_CHANGED, _animation_cb, params);
482 efl_ui_check_selected_set(ck, efl_ui_active_view_view_manager_animation_enabled_get(efl_ui_active_view_manager_get(params->active_view))); 482 efl_ui_check_selected_set(ck, efl_ui_spotlight_manager_animation_enabled_get(efl_ui_spotlight_manager_get(params->spotlight)));
483 efl_text_set(ck, "Animation"); 483 efl_text_set(ck, "Animation");
484 efl_pack_end(box, ck); 484 efl_pack_end(box, ck);
485 efl_gfx_entity_visible_set(ck, 1); 485 efl_gfx_entity_visible_set(ck, 1);
@@ -492,7 +492,7 @@ pack_cb(void *data,
492{ 492{
493 Params *params = (Params *)data; 493 Params *params = (Params *)data;
494 Evas_Object *navi = params->navi; 494 Evas_Object *navi = params->navi;
495 Eo *active_view = params->active_view; 495 Eo *spotlight = params->spotlight;
496 Eo *btn, *box, *in_box1, *in_box2, *sp1, *sp2; 496 Eo *btn, *box, *in_box1, *in_box2, *sp1, *sp2;
497 Pack_Params *pack_param; 497 Pack_Params *pack_param;
498 498
@@ -512,9 +512,9 @@ pack_cb(void *data,
512 512
513 sp1 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box1, 513 sp1 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box1,
514 efl_ui_range_limits_set(efl_added, 0, 514 efl_ui_range_limits_set(efl_added, 0,
515 efl_content_count(active_view)), 515 efl_content_count(spotlight)),
516 efl_ui_range_value_set(efl_added, 516 efl_ui_range_value_set(efl_added,
517 efl_ui_active_view_active_index_get(active_view))); 517 efl_ui_spotlight_active_index_get(spotlight)));
518 518
519 in_box2 = efl_add(EFL_UI_BOX_CLASS, box, 519 in_box2 = efl_add(EFL_UI_BOX_CLASS, box,
520 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 520 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
@@ -529,7 +529,7 @@ pack_cb(void *data,
529 pack_param = calloc(1, sizeof(Pack_Params)); 529 pack_param = calloc(1, sizeof(Pack_Params));
530 if (!pack_param) return; 530 if (!pack_param) return;
531 531
532 pack_param->active_view = active_view; 532 pack_param->spotlight = spotlight;
533 pack_param->pack_sp = sp1; 533 pack_param->pack_sp = sp1;
534 pack_param->unpack_sp = sp2; 534 pack_param->unpack_sp = sp2;
535 pack_param->unpack_btn = btn; 535 pack_param->unpack_btn = btn;
@@ -547,7 +547,7 @@ pack_cb(void *data,
547 pack_param = calloc(1, sizeof(Pack_Params)); 547 pack_param = calloc(1, sizeof(Pack_Params));
548 if (!pack_param) return; 548 if (!pack_param) return;
549 549
550 pack_param->active_view = active_view; 550 pack_param->spotlight = spotlight;
551 pack_param->pack_sp = sp1; 551 pack_param->pack_sp = sp1;
552 pack_param->unpack_sp = sp2; 552 pack_param->unpack_sp = sp2;
553 pack_param->unpack_btn = btn; 553 pack_param->unpack_btn = btn;
@@ -565,7 +565,7 @@ pack_cb(void *data,
565 pack_param = calloc(1, sizeof(Pack_Params)); 565 pack_param = calloc(1, sizeof(Pack_Params));
566 if (!pack_param) return; 566 if (!pack_param) return;
567 567
568 pack_param->active_view = active_view; 568 pack_param->spotlight = spotlight;
569 pack_param->pack_sp = sp1; 569 pack_param->pack_sp = sp1;
570 pack_param->unpack_sp = sp2; 570 pack_param->unpack_sp = sp2;
571 pack_param->unpack_btn = btn; 571 pack_param->unpack_btn = btn;
@@ -583,7 +583,7 @@ pack_cb(void *data,
583 pack_param = calloc(1, sizeof(Pack_Params)); 583 pack_param = calloc(1, sizeof(Pack_Params));
584 if (!pack_param) return; 584 if (!pack_param) return;
585 585
586 pack_param->active_view = active_view; 586 pack_param->spotlight = spotlight;
587 pack_param->pack_sp = sp1; 587 pack_param->pack_sp = sp1;
588 pack_param->unpack_sp = sp2; 588 pack_param->unpack_sp = sp2;
589 pack_param->unpack_btn = btn; 589 pack_param->unpack_btn = btn;
@@ -601,7 +601,7 @@ pack_cb(void *data,
601 pack_param = calloc(1, sizeof(Pack_Params)); 601 pack_param = calloc(1, sizeof(Pack_Params));
602 if (!pack_param) return; 602 if (!pack_param) return;
603 603
604 pack_param->active_view = active_view; 604 pack_param->spotlight = spotlight;
605 pack_param->pack_sp = sp1; 605 pack_param->pack_sp = sp1;
606 pack_param->unpack_sp = sp2; 606 pack_param->unpack_sp = sp2;
607 pack_param->unpack_btn = btn; 607 pack_param->unpack_btn = btn;
@@ -622,7 +622,7 @@ pack_cb(void *data,
622 pack_param = calloc(1, sizeof(Pack_Params)); 622 pack_param = calloc(1, sizeof(Pack_Params));
623 if (!pack_param) return; 623 if (!pack_param) return;
624 624
625 pack_param->active_view = active_view; 625 pack_param->spotlight = spotlight;
626 pack_param->pack_sp = sp1; 626 pack_param->pack_sp = sp1;
627 pack_param->unpack_sp = sp2; 627 pack_param->unpack_sp = sp2;
628 pack_param->unpack_btn = btn; 628 pack_param->unpack_btn = btn;
@@ -633,12 +633,12 @@ pack_cb(void *data,
633 efl_event_callback_add(btn, EFL_EVENT_DEL, 633 efl_event_callback_add(btn, EFL_EVENT_DEL,
634 pack_btn_del_cb, pack_param); 634 pack_btn_del_cb, pack_param);
635 635
636 if (efl_content_count(active_view) > 0) 636 if (efl_content_count(spotlight) > 0)
637 { 637 {
638 efl_ui_range_limits_set(sp2, 0, 638 efl_ui_range_limits_set(sp2, 0,
639 (efl_content_count(active_view) - 1)); 639 (efl_content_count(spotlight) - 1));
640 efl_ui_range_value_set(sp2, 640 efl_ui_range_value_set(sp2,
641 efl_ui_active_view_active_index_get(active_view)); 641 efl_ui_spotlight_active_index_get(spotlight));
642 } 642 }
643 else 643 else
644 { 644 {
@@ -654,7 +654,7 @@ pack_cb(void *data,
654 pack_param = calloc(1, sizeof(Pack_Params)); 654 pack_param = calloc(1, sizeof(Pack_Params));
655 if (!pack_param) return; 655 if (!pack_param) return;
656 656
657 pack_param->active_view = active_view; 657 pack_param->spotlight = spotlight;
658 pack_param->pack_sp = sp1; 658 pack_param->pack_sp = sp1;
659 pack_param->unpack_sp = sp2; 659 pack_param->unpack_sp = sp2;
660 pack_param->unpack_btn = btn; 660 pack_param->unpack_btn = btn;
@@ -676,7 +676,7 @@ active_index_cb(void *data,
676{ 676{
677 Params *params = (Params *)data; 677 Params *params = (Params *)data;
678 Evas_Object *navi = params->navi; 678 Evas_Object *navi = params->navi;
679 Eo *active_view = params->active_view; 679 Eo *spotlight = params->spotlight;
680 Eo *btn, *box, *sp; 680 Eo *btn, *box, *sp;
681 Page_Set_Params *psp = calloc(1, sizeof(Page_Set_Params)); 681 Page_Set_Params *psp = calloc(1, sizeof(Page_Set_Params));
682 if (!psp) return; 682 if (!psp) return;
@@ -699,12 +699,12 @@ active_index_cb(void *data,
699 efl_gfx_hint_align_set(efl_added, -1, -1), 699 efl_gfx_hint_align_set(efl_added, -1, -1),
700 efl_pack_end(box, efl_added)); 700 efl_pack_end(box, efl_added));
701 701
702 if (efl_content_count(active_view) > 0) 702 if (efl_content_count(spotlight) > 0)
703 { 703 {
704 efl_ui_range_limits_set(sp, 0, 704 efl_ui_range_limits_set(sp, 0,
705 (efl_content_count(active_view) - 1)); 705 (efl_content_count(spotlight) - 1));
706 efl_ui_range_value_set(sp, 706 efl_ui_range_value_set(sp,
707 efl_ui_active_view_active_index_get(active_view)); 707 efl_ui_spotlight_active_index_get(spotlight));
708 } 708 }
709 else 709 else
710 { 710 {
@@ -712,7 +712,7 @@ active_index_cb(void *data,
712 elm_object_disabled_set(sp, EINA_TRUE); 712 elm_object_disabled_set(sp, EINA_TRUE);
713 } 713 }
714 714
715 psp->active_view = active_view; 715 psp->spotlight = spotlight;
716 psp->spinner = sp; 716 psp->spinner = sp;
717 717
718 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, page_set_btn_cb, psp); 718 efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, page_set_btn_cb, psp);
@@ -752,18 +752,18 @@ indicator_cb(void *data,
752} 752}
753 753
754void 754void
755test_ui_active_view_stack(void *data EINA_UNUSED, 755test_ui_spotlight_stack(void *data EINA_UNUSED,
756 Evas_Object *obj EINA_UNUSED, 756 Evas_Object *obj EINA_UNUSED,
757 void *event_info EINA_UNUSED) 757 void *event_info EINA_UNUSED)
758{ 758{
759 Eo *win, *panes, *navi, *list, *layout, *active_view, *view; 759 Eo *win, *panes, *navi, *list, *layout, *spotlight, *view;
760 Params *params = NULL; 760 Params *params = NULL;
761 char buf[PATH_MAX]; 761 char buf[PATH_MAX];
762 int i; 762 int i;
763 763
764 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 764 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
765 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC), 765 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
766 efl_text_set(efl_added, "Efl.Ui.Active_View Stack"), 766 efl_text_set(efl_added, "Efl.Ui.Spotlight Stack"),
767 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 767 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
768 768
769 panes = efl_add(EFL_UI_PANES_CLASS, win, 769 panes = efl_add(EFL_UI_PANES_CLASS, win,
@@ -789,36 +789,36 @@ test_ui_active_view_stack(void *data EINA_UNUSED,
789 efl_file_load(efl_added), 789 efl_file_load(efl_added),
790 efl_content_set(efl_part(panes, "second"), efl_added)); 790 efl_content_set(efl_part(panes, "second"), efl_added));
791 791
792 active_view = efl_add(EFL_UI_ACTIVE_VIEW_CONTAINER_CLASS, layout, 792 spotlight = efl_add(EFL_UI_SPOTLIGHT_CONTAINER_CLASS, layout,
793 efl_content_set(efl_part(layout, "pager"), efl_added), 793 efl_content_set(efl_part(layout, "pager"), efl_added),
794 efl_ui_active_view_size_set(efl_added, EINA_SIZE2D(200, 300))); 794 efl_ui_spotlight_size_set(efl_added, EINA_SIZE2D(200, 300)));
795 795
796 efl_ui_active_view_manager_set(active_view, efl_new(EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_STACK_CLASS)); 796 efl_ui_spotlight_manager_set(spotlight, efl_new(EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS));
797 797
798 efl_add(EFL_UI_BUTTON_CLASS, layout, 798 efl_add(EFL_UI_BUTTON_CLASS, layout,
799 efl_text_set(efl_added, "Prev"), 799 efl_text_set(efl_added, "Prev"),
800 efl_event_callback_add(efl_added, 800 efl_event_callback_add(efl_added,
801 EFL_UI_EVENT_CLICKED, prev_btn_cb, active_view), 801 EFL_UI_EVENT_CLICKED, prev_btn_cb, spotlight),
802 efl_content_set(efl_part(layout, "prev_btn"), efl_added)); 802 efl_content_set(efl_part(layout, "prev_btn"), efl_added));
803 803
804 efl_add(EFL_UI_BUTTON_CLASS, layout, 804 efl_add(EFL_UI_BUTTON_CLASS, layout,
805 efl_text_set(efl_added, "Next"), 805 efl_text_set(efl_added, "Next"),
806 efl_event_callback_add(efl_added, 806 efl_event_callback_add(efl_added,
807 EFL_UI_EVENT_CLICKED, next_btn_cb, active_view), 807 EFL_UI_EVENT_CLICKED, next_btn_cb, spotlight),
808 efl_content_set(efl_part(layout, "next_btn"), efl_added)); 808 efl_content_set(efl_part(layout, "next_btn"), efl_added));
809 809
810 params = calloc(1, sizeof(Params)); 810 params = calloc(1, sizeof(Params));
811 if (!params) return; 811 if (!params) return;
812 812
813 params->navi = navi; 813 params->navi = navi;
814 params->active_view = active_view; 814 params->spotlight = spotlight;
815 params->indicator = NULL; 815 params->indicator = NULL;
816 params->w = 200; 816 params->w = 200;
817 params->h = 300; 817 params->h = 300;
818 params->wfill = EINA_FALSE; 818 params->wfill = EINA_FALSE;
819 params->hfill = EINA_FALSE; 819 params->hfill = EINA_FALSE;
820 820
821 elm_list_item_append(list, "View Size", NULL, NULL, active_view_size, params); 821 elm_list_item_append(list, "View Size", NULL, NULL, spotlight_size, params);
822 elm_list_item_append(list, "Pack / Unpack", NULL, NULL, pack_cb, params); 822 elm_list_item_append(list, "Pack / Unpack", NULL, NULL, pack_cb, params);
823 elm_list_item_append(list, "Active Index", NULL, NULL, active_index_cb, params); 823 elm_list_item_append(list, "Active Index", NULL, NULL, active_index_cb, params);
824 elm_list_item_append(list, "Indicator", NULL, NULL, indicator_cb, params); 824 elm_list_item_append(list, "Indicator", NULL, NULL, indicator_cb, params);
@@ -832,40 +832,40 @@ test_ui_active_view_stack(void *data EINA_UNUSED,
832 switch (i % 3) 832 switch (i % 3)
833 { 833 {
834 case 0: 834 case 0:
835 view = view_add(LAYOUT, active_view); 835 view = view_add(LAYOUT, spotlight);
836 break; 836 break;
837 837
838 case 1: 838 case 1:
839 view = view_add(LIST, active_view); 839 view = view_add(LIST, spotlight);
840 break; 840 break;
841 841
842 case 2: 842 case 2:
843 view = view_add(BUTTON, active_view); 843 view = view_add(BUTTON, spotlight);
844 break; 844 break;
845 845
846 default: 846 default:
847 view = view_add(LAYOUT, active_view); 847 view = view_add(LAYOUT, spotlight);
848 break; 848 break;
849 } 849 }
850 efl_pack_end(active_view, view); 850 efl_pack_end(spotlight, view);
851 } 851 }
852 852
853 efl_gfx_entity_size_set(win, EINA_SIZE2D(580, 320)); 853 efl_gfx_entity_size_set(win, EINA_SIZE2D(580, 320));
854} 854}
855 855
856void 856void
857test_ui_active_view_plain(void *data EINA_UNUSED, 857test_ui_spotlight_plain(void *data EINA_UNUSED,
858 Evas_Object *obj EINA_UNUSED, 858 Evas_Object *obj EINA_UNUSED,
859 void *event_info EINA_UNUSED) 859 void *event_info EINA_UNUSED)
860{ 860{
861 Eo *win, *panes, *navi, *list, *layout, *active_view, *view; 861 Eo *win, *panes, *navi, *list, *layout, *spotlight, *view;
862 Params *params = NULL; 862 Params *params = NULL;
863 char buf[PATH_MAX]; 863 char buf[PATH_MAX];
864 int i; 864 int i;
865 865
866 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 866 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
867 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC), 867 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
868 efl_text_set(efl_added, "Efl.Ui.Active_View Plain"), 868 efl_text_set(efl_added, "Efl.Ui.Spotlight Plain"),
869 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 869 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
870 870
871 panes = efl_add(EFL_UI_PANES_CLASS, win, 871 panes = efl_add(EFL_UI_PANES_CLASS, win,
@@ -891,34 +891,34 @@ test_ui_active_view_plain(void *data EINA_UNUSED,
891 efl_file_load(efl_added), 891 efl_file_load(efl_added),
892 efl_content_set(efl_part(panes, "second"), efl_added)); 892 efl_content_set(efl_part(panes, "second"), efl_added));
893 893
894 active_view = efl_add(EFL_UI_ACTIVE_VIEW_CONTAINER_CLASS, layout, 894 spotlight = efl_add(EFL_UI_SPOTLIGHT_CONTAINER_CLASS, layout,
895 efl_content_set(efl_part(layout, "pager"), efl_added), 895 efl_content_set(efl_part(layout, "pager"), efl_added),
896 efl_ui_active_view_size_set(efl_added, EINA_SIZE2D(200, 300))); 896 efl_ui_spotlight_size_set(efl_added, EINA_SIZE2D(200, 300)));
897 897
898 efl_add(EFL_UI_BUTTON_CLASS, layout, 898 efl_add(EFL_UI_BUTTON_CLASS, layout,
899 efl_text_set(efl_added, "Prev"), 899 efl_text_set(efl_added, "Prev"),
900 efl_event_callback_add(efl_added, 900 efl_event_callback_add(efl_added,
901 EFL_UI_EVENT_CLICKED, prev_btn_cb, active_view), 901 EFL_UI_EVENT_CLICKED, prev_btn_cb, spotlight),
902 efl_content_set(efl_part(layout, "prev_btn"), efl_added)); 902 efl_content_set(efl_part(layout, "prev_btn"), efl_added));
903 903
904 efl_add(EFL_UI_BUTTON_CLASS, layout, 904 efl_add(EFL_UI_BUTTON_CLASS, layout,
905 efl_text_set(efl_added, "Next"), 905 efl_text_set(efl_added, "Next"),
906 efl_event_callback_add(efl_added, 906 efl_event_callback_add(efl_added,
907 EFL_UI_EVENT_CLICKED, next_btn_cb, active_view), 907 EFL_UI_EVENT_CLICKED, next_btn_cb, spotlight),
908 efl_content_set(efl_part(layout, "next_btn"), efl_added)); 908 efl_content_set(efl_part(layout, "next_btn"), efl_added));
909 909
910 params = calloc(1, sizeof(Params)); 910 params = calloc(1, sizeof(Params));
911 if (!params) return; 911 if (!params) return;
912 912
913 params->navi = navi; 913 params->navi = navi;
914 params->active_view = active_view; 914 params->spotlight = spotlight;
915 params->indicator = NULL; 915 params->indicator = NULL;
916 params->w = 200; 916 params->w = 200;
917 params->h = 300; 917 params->h = 300;
918 params->wfill = EINA_FALSE; 918 params->wfill = EINA_FALSE;
919 params->hfill = EINA_FALSE; 919 params->hfill = EINA_FALSE;
920 920
921 elm_list_item_append(list, "View Size", NULL, NULL, active_view_size, params); 921 elm_list_item_append(list, "View Size", NULL, NULL, spotlight_size, params);
922 elm_list_item_append(list, "Pack / Unpack", NULL, NULL, pack_cb, params); 922 elm_list_item_append(list, "Pack / Unpack", NULL, NULL, pack_cb, params);
923 elm_list_item_append(list, "Active Index", NULL, NULL, active_index_cb, params); 923 elm_list_item_append(list, "Active Index", NULL, NULL, active_index_cb, params);
924 elm_list_item_append(list, "Indicator", NULL, NULL, indicator_cb, params); 924 elm_list_item_append(list, "Indicator", NULL, NULL, indicator_cb, params);
@@ -931,40 +931,40 @@ test_ui_active_view_plain(void *data EINA_UNUSED,
931 switch (i % 3) 931 switch (i % 3)
932 { 932 {
933 case 0: 933 case 0:
934 view = view_add(LAYOUT, active_view); 934 view = view_add(LAYOUT, spotlight);
935 break; 935 break;
936 936
937 case 1: 937 case 1:
938 view = view_add(LIST, active_view); 938 view = view_add(LIST, spotlight);
939 break; 939 break;
940 940
941 case 2: 941 case 2:
942 view = view_add(BUTTON, active_view); 942 view = view_add(BUTTON, spotlight);
943 break; 943 break;
944 944
945 default: 945 default:
946 view = view_add(LAYOUT, active_view); 946 view = view_add(LAYOUT, spotlight);
947 break; 947 break;
948 } 948 }
949 efl_pack_end(active_view, view); 949 efl_pack_end(spotlight, view);
950 } 950 }
951 951
952 efl_gfx_entity_size_set(win, EINA_SIZE2D(580, 320)); 952 efl_gfx_entity_size_set(win, EINA_SIZE2D(580, 320));
953} 953}
954 954
955void 955void
956test_ui_active_view_scroll(void *data EINA_UNUSED, 956test_ui_spotlight_scroll(void *data EINA_UNUSED,
957 Evas_Object *obj EINA_UNUSED, 957 Evas_Object *obj EINA_UNUSED,
958 void *event_info EINA_UNUSED) 958 void *event_info EINA_UNUSED)
959{ 959{
960 Eo *win, *panes, *navi, *list, *layout, *active_view, *view; 960 Eo *win, *panes, *navi, *list, *layout, *spotlight, *view;
961 Params *params = NULL; 961 Params *params = NULL;
962 char buf[PATH_MAX]; 962 char buf[PATH_MAX];
963 int i; 963 int i;
964 964
965 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), 965 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
966 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC), 966 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
967 efl_text_set(efl_added, "Efl.Ui.Active_View Scroll"), 967 efl_text_set(efl_added, "Efl.Ui.Spotlight Scroll"),
968 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 968 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
969 969
970 panes = efl_add(EFL_UI_PANES_CLASS, win, 970 panes = efl_add(EFL_UI_PANES_CLASS, win,
@@ -990,36 +990,36 @@ test_ui_active_view_scroll(void *data EINA_UNUSED,
990 efl_file_load(efl_added), 990 efl_file_load(efl_added),
991 efl_content_set(efl_part(panes, "second"), efl_added)); 991 efl_content_set(efl_part(panes, "second"), efl_added));
992 992
993 active_view = efl_add(EFL_UI_ACTIVE_VIEW_CONTAINER_CLASS, layout, 993 spotlight = efl_add(EFL_UI_SPOTLIGHT_CONTAINER_CLASS, layout,
994 efl_content_set(efl_part(layout, "pager"), efl_added), 994 efl_content_set(efl_part(layout, "pager"), efl_added),
995 efl_ui_active_view_size_set(efl_added, EINA_SIZE2D(200, 300))); 995 efl_ui_spotlight_size_set(efl_added, EINA_SIZE2D(200, 300)));
996 996
997 efl_ui_active_view_manager_set(active_view, efl_new(EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_SCROLL_CLASS)); 997 efl_ui_spotlight_manager_set(spotlight, efl_new(EFL_UI_SPOTLIGHT_MANAGER_SCROLL_CLASS));
998 998
999 efl_add(EFL_UI_BUTTON_CLASS, layout, 999 efl_add(EFL_UI_BUTTON_CLASS, layout,
1000 efl_text_set(efl_added, "Prev"), 1000 efl_text_set(efl_added, "Prev"),
1001 efl_event_callback_add(efl_added, 1001 efl_event_callback_add(efl_added,
1002 EFL_UI_EVENT_CLICKED, prev_btn_cb, active_view), 1002 EFL_UI_EVENT_CLICKED, prev_btn_cb, spotlight),
1003 efl_content_set(efl_part(layout, "prev_btn"), efl_added)); 1003 efl_content_set(efl_part(layout, "prev_btn"), efl_added));
1004 1004
1005 efl_add(EFL_UI_BUTTON_CLASS, layout, 1005 efl_add(EFL_UI_BUTTON_CLASS, layout,
1006 efl_text_set(efl_added, "Next"), 1006 efl_text_set(efl_added, "Next"),
1007 efl_event_callback_add(efl_added, 1007 efl_event_callback_add(efl_added,
1008 EFL_UI_EVENT_CLICKED, next_btn_cb, active_view), 1008 EFL_UI_EVENT_CLICKED, next_btn_cb, spotlight),
1009 efl_content_set(efl_part(layout, "next_btn"), efl_added)); 1009 efl_content_set(efl_part(layout, "next_btn"), efl_added));
1010 1010
1011 params = calloc(1, sizeof(Params)); 1011 params = calloc(1, sizeof(Params));
1012 if (!params) return; 1012 if (!params) return;
1013 1013
1014 params->navi = navi; 1014 params->navi = navi;
1015 params->active_view = active_view; 1015 params->spotlight = spotlight;
1016 params->indicator = NULL; 1016 params->indicator = NULL;
1017 params->w = 200; 1017 params->w = 200;
1018 params->h = 300; 1018 params->h = 300;
1019 params->wfill = EINA_FALSE; 1019 params->wfill = EINA_FALSE;
1020 params->hfill = EINA_FALSE; 1020 params->hfill = EINA_FALSE;
1021 1021
1022 elm_list_item_append(list, "View Size", NULL, NULL, active_view_size, params); 1022 elm_list_item_append(list, "View Size", NULL, NULL, spotlight_size, params);
1023 elm_list_item_append(list, "Pack / Unpack", NULL, NULL, pack_cb, params); 1023 elm_list_item_append(list, "Pack / Unpack", NULL, NULL, pack_cb, params);
1024 elm_list_item_append(list, "Active Index", NULL, NULL, active_index_cb, params); 1024 elm_list_item_append(list, "Active Index", NULL, NULL, active_index_cb, params);
1025 elm_list_item_append(list, "Indicator", NULL, NULL, indicator_cb, params); 1025 elm_list_item_append(list, "Indicator", NULL, NULL, indicator_cb, params);
@@ -1032,22 +1032,22 @@ test_ui_active_view_scroll(void *data EINA_UNUSED,
1032 switch (i % 3) 1032 switch (i % 3)
1033 { 1033 {
1034 case 0: 1034 case 0:
1035 view = view_add(LAYOUT, active_view); 1035 view = view_add(LAYOUT, spotlight);
1036 break; 1036 break;
1037 1037
1038 case 1: 1038 case 1:
1039 view = view_add(LIST, active_view); 1039 view = view_add(LIST, spotlight);
1040 break; 1040 break;
1041 1041
1042 case 2: 1042 case 2:
1043 view = view_add(BUTTON, active_view); 1043 view = view_add(BUTTON, spotlight);
1044 break; 1044 break;
1045 1045
1046 default: 1046 default:
1047 view = view_add(LAYOUT, active_view); 1047 view = view_add(LAYOUT, spotlight);
1048 break; 1048 break;
1049 } 1049 }
1050 efl_pack_end(active_view, view); 1050 efl_pack_end(spotlight, view);
1051 } 1051 }
1052 1052
1053 efl_gfx_entity_size_set(win, EINA_SIZE2D(580, 320)); 1053 efl_gfx_entity_size_set(win, EINA_SIZE2D(580, 320));
diff --git a/src/bin/elementary/test_ui_stack.c b/src/bin/elementary/test_ui_stack.c
index f5ef762d8e..bd1c475959 100644
--- a/src/bin/elementary/test_ui_stack.c
+++ b/src/bin/elementary/test_ui_stack.c
@@ -19,7 +19,7 @@ static void
19_stack_pop(void *data, const Efl_Event *ev EINA_UNUSED) 19_stack_pop(void *data, const Efl_Event *ev EINA_UNUSED)
20{ 20{
21 Eo *stack = data; 21 Eo *stack = data;
22 efl_ui_active_view_pop(stack, EINA_TRUE); 22 efl_ui_spotlight_pop(stack, EINA_TRUE);
23} 23}
24 24
25static void 25static void
@@ -99,7 +99,7 @@ _fifth_layout_insert(void *data, const Efl_Event *ev EINA_UNUSED)
99 99
100 Eo *nl = _navigation_layout_create(stack, "5th layout", btn); 100 Eo *nl = _navigation_layout_create(stack, "5th layout", btn);
101 101
102 efl_ui_active_view_push(stack, nl); 102 efl_ui_spotlight_push(stack, nl);
103} 103}
104 104
105static void 105static void
@@ -115,7 +115,7 @@ _third_layout_push(void *data, const Efl_Event *ev EINA_UNUSED)
115 115
116 _bar_right_btn_set(nl, _fifth_layout_insert, stack); 116 _bar_right_btn_set(nl, _fifth_layout_insert, stack);
117 117
118 efl_ui_active_view_push(stack, nl); 118 efl_ui_spotlight_push(stack, nl);
119} 119}
120 120
121static void 121static void
@@ -131,7 +131,7 @@ _second_layout_push(void *data, const Efl_Event *ev EINA_UNUSED)
131 131
132 _bar_right_btn_set(nl, _third_layout_push, stack); 132 _bar_right_btn_set(nl, _third_layout_push, stack);
133 133
134 efl_ui_active_view_push(stack, nl); 134 efl_ui_spotlight_push(stack, nl);
135} 135}
136 136
137static void 137static void
@@ -146,7 +146,7 @@ _first_layout_push(Eo *win, Eo *stack)
146 _bar_left_btn_set(nl, _win_del, win); 146 _bar_left_btn_set(nl, _win_del, win);
147 _bar_right_btn_set(nl, _second_layout_push, stack); 147 _bar_right_btn_set(nl, _second_layout_push, stack);
148 148
149 efl_ui_active_view_push(stack, nl); 149 efl_ui_spotlight_push(stack, nl);
150} 150}
151 151
152void 152void
@@ -158,7 +158,7 @@ test_ui_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
158 158
159 efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500)); 159 efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
160 160
161 Eo *stack = efl_ui_active_view_util_stack_gen(win); 161 Eo *stack = efl_ui_spotlight_util_stack_gen(win);
162 162
163 efl_content_set(win, stack); 163 efl_content_set(win, stack);
164 164
diff --git a/src/bin/elementary/test_ui_tab_pager.c b/src/bin/elementary/test_ui_tab_pager.c
index bd316229c2..fe7dc968f7 100644
--- a/src/bin/elementary/test_ui_tab_pager.c
+++ b/src/bin/elementary/test_ui_tab_pager.c
@@ -165,7 +165,7 @@ test_ui_tab_pager(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev
165 efl_pack_end(tp, page); 165 efl_pack_end(tp, page);
166 } 166 }
167 167
168 efl_ui_active_view_active_index_set(tp, 0); 168 efl_ui_spotlight_active_index_set(tp, 0);
169 169
170 ad = (App_Data*)calloc(1, sizeof(App_Data)); 170 ad = (App_Data*)calloc(1, sizeof(App_Data));
171 ad->navi = navi; 171 ad->navi = navi;
@@ -199,7 +199,7 @@ static void
199_tab_set_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) 199_tab_set_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
200{ 200{
201 Tab_Set_Data *tsd = data; 201 Tab_Set_Data *tsd = data;
202 efl_ui_active_view_active_index_set(tsd->tab_pager, elm_spinner_value_get(tsd->spinner)); 202 efl_ui_spotlight_active_index_set(tsd->tab_pager, elm_spinner_value_get(tsd->spinner));
203} 203}
204 204
205static void 205static void
@@ -230,7 +230,7 @@ _current_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
230 230
231 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, box, 231 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, box,
232 efl_ui_range_limits_set(efl_added, 0, efl_content_count(tab_pager) - 1), 232 efl_ui_range_limits_set(efl_added, 0, efl_content_count(tab_pager) - 1),
233 efl_ui_range_value_set(efl_added, efl_ui_active_view_active_index_get(tab_pager)), 233 efl_ui_range_value_set(efl_added, efl_ui_spotlight_active_index_get(tab_pager)),
234 efl_pack_end(box, efl_added)); 234 efl_pack_end(box, efl_added));
235 235
236 tsd->tab_pager = tab_pager; 236 tsd->tab_pager = tab_pager;
@@ -272,7 +272,7 @@ _pack_before_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
272 Eo *tab_page, *cur_tab_page; 272 Eo *tab_page, *cur_tab_page;
273 int index; 273 int index;
274 274
275 index = efl_ui_active_view_active_index_get(tab_pager); 275 index = efl_ui_spotlight_active_index_get(tab_pager);
276 cur_tab_page = efl_pack_content_get(tab_pager, index); 276 cur_tab_page = efl_pack_content_get(tab_pager, index);
277 277
278 tab_page = tab_page_add(tab_pager); 278 tab_page = tab_page_add(tab_pager);
@@ -287,7 +287,7 @@ _pack_after_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
287 Eo *tab_page, *cur_tab_page; 287 Eo *tab_page, *cur_tab_page;
288 int index; 288 int index;
289 289
290 index = efl_ui_active_view_active_index_get(tab_pager); 290 index = efl_ui_spotlight_active_index_get(tab_pager);
291 cur_tab_page = efl_pack_content_get(tab_pager, index); 291 cur_tab_page = efl_pack_content_get(tab_pager, index);
292 292
293 tab_page = tab_page_add(tab_pager); 293 tab_page = tab_page_add(tab_pager);
@@ -364,7 +364,7 @@ _pack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
364 364
365 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box, 365 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box,
366 efl_ui_range_limits_set(efl_added, 0, efl_content_count(tab_pager) - 1), 366 efl_ui_range_limits_set(efl_added, 0, efl_content_count(tab_pager) - 1),
367 efl_ui_range_value_set(efl_added, efl_ui_active_view_active_index_get(tab_pager)), 367 efl_ui_range_value_set(efl_added, efl_ui_spotlight_active_index_get(tab_pager)),
368 efl_pack_end(in_box, efl_added)); 368 efl_pack_end(in_box, efl_added));
369 369
370 tsd->tab_pager = tab_pager; 370 tsd->tab_pager = tab_pager;
@@ -389,7 +389,7 @@ static void
389_unpack_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) 389_unpack_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
390{ 390{
391 Eo *tab_pager = data; 391 Eo *tab_pager = data;
392 int index = efl_ui_active_view_active_index_get(tab_pager); 392 int index = efl_ui_spotlight_active_index_get(tab_pager);
393 Eo *tab_page = efl_pack_content_get(tab_pager, index); 393 Eo *tab_page = efl_pack_content_get(tab_pager, index);
394 efl_pack_unpack(tab_pager, tab_page); 394 efl_pack_unpack(tab_pager, tab_page);
395 efl_del(tab_page); 395 efl_del(tab_page);
@@ -464,7 +464,7 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
464 464
465 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box, 465 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box,
466 efl_ui_range_limits_set(efl_added, 0, efl_content_count(tab_pager) - 1), 466 efl_ui_range_limits_set(efl_added, 0, efl_content_count(tab_pager) - 1),
467 efl_ui_range_value_set(efl_added, efl_ui_active_view_active_index_get(tab_pager)), 467 efl_ui_range_value_set(efl_added, efl_ui_spotlight_active_index_get(tab_pager)),
468 efl_pack_end(in_box, efl_added)); 468 efl_pack_end(in_box, efl_added));
469 469
470 tsd->tab_pager = tab_pager; 470 tsd->tab_pager = tab_pager;
@@ -488,7 +488,7 @@ _change_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
488 char *label = NULL; 488 char *label = NULL;
489 char *icon = NULL; 489 char *icon = NULL;
490 int cur; 490 int cur;
491 cur = efl_ui_active_view_active_index_get(tcd->tab_pager); 491 cur = efl_ui_spotlight_active_index_get(tcd->tab_pager);
492 tab_page = efl_pack_content_get(tcd->tab_pager, cur); 492 tab_page = efl_pack_content_get(tcd->tab_pager, cur);
493 493
494 if (efl_ui_check_selected_get(tcd->label_check)) 494 if (efl_ui_check_selected_get(tcd->label_check))
@@ -556,23 +556,23 @@ _tab_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
556static void 556static void
557_tran_set_btn_scroll_cb(void *data, const Efl_Event *ev EINA_UNUSED) 557_tran_set_btn_scroll_cb(void *data, const Efl_Event *ev EINA_UNUSED)
558{ 558{
559 Efl_Ui_Active_View_View_Manager_Scroll *scroll = efl_new(EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_SCROLL_CLASS); 559 Efl_Ui_Spotlight_Manager_Scroll *scroll = efl_new(EFL_UI_SPOTLIGHT_MANAGER_SCROLL_CLASS);
560 efl_ui_active_view_manager_set(data, scroll); 560 efl_ui_spotlight_manager_set(data, scroll);
561 efl_unref(scroll); 561 efl_unref(scroll);
562} 562}
563 563
564static void 564static void
565_tran_set_btn_stack_cb(void *data, const Efl_Event *ev EINA_UNUSED) 565_tran_set_btn_stack_cb(void *data, const Efl_Event *ev EINA_UNUSED)
566{ 566{
567 Efl_Ui_Active_View_View_Manager_Scroll *stack = efl_new(EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_STACK_CLASS); 567 Efl_Ui_Spotlight_Manager_Scroll *stack = efl_new(EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS);
568 efl_ui_active_view_manager_set(data, stack); 568 efl_ui_spotlight_manager_set(data, stack);
569 efl_unref(stack); 569 efl_unref(stack);
570} 570}
571 571
572static void 572static void
573_tran_unset_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) 573_tran_unset_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
574{ 574{
575 efl_ui_active_view_manager_set(data, NULL); 575 efl_ui_spotlight_manager_set(data, NULL);
576} 576}
577 577
578static void 578static void
diff --git a/src/examples/elementary/efl_ui_slideshow_example.c b/src/examples/elementary/efl_ui_slideshow_example.c
index fdf236e000..4681037b3e 100644
--- a/src/examples/elementary/efl_ui_slideshow_example.c
+++ b/src/examples/elementary/efl_ui_slideshow_example.c
@@ -2,7 +2,7 @@
2 2
3#include <Elementary.h> 3#include <Elementary.h>
4 4
5static Efl_Ui_Active_View_Container *container; 5static Efl_Ui_Spotlight_Container *container;
6static Eina_Bool play_state = EINA_FALSE; 6static Eina_Bool play_state = EINA_FALSE;
7static Efl_Loop_Timer *show_timer = NULL; 7static Efl_Loop_Timer *show_timer = NULL;
8 8
@@ -25,9 +25,9 @@ _show_next(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
25 efl_del(show_timer); 25 efl_del(show_timer);
26 show_timer = NULL; 26 show_timer = NULL;
27 27
28 int current_index = efl_ui_active_view_active_index_get(container); 28 int current_index = efl_ui_spotlight_active_index_get(container);
29 int new_index = (current_index + 1) % efl_content_count(container); 29 int new_index = (current_index + 1) % efl_content_count(container);
30 efl_ui_active_view_active_index_set(container, new_index); 30 efl_ui_spotlight_active_index_set(container, new_index);
31} 31}
32 32
33static void 33static void
@@ -90,11 +90,11 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
90 table = efl_add(EFL_UI_TABLE_CLASS, win); 90 table = efl_add(EFL_UI_TABLE_CLASS, win);
91 efl_content_set(win, table); 91 efl_content_set(win, table);
92 92
93 container = efl_add(EFL_UI_ACTIVE_VIEW_CONTAINER_CLASS, win, 93 container = efl_add(EFL_UI_SPOTLIGHT_CONTAINER_CLASS, win,
94 efl_event_callback_add(efl_added, EFL_UI_ACTIVE_VIEW_EVENT_TRANSITION_END, _container_end, NULL), 94 efl_event_callback_add(efl_added, EFL_UI_SPOTLIGHT_EVENT_TRANSITION_END, _container_end, NULL),
95 efl_pack_table(table, efl_added, 0, 0, 1, 1)); 95 efl_pack_table(table, efl_added, 0, 0, 1, 1));
96 efl_ui_active_view_indicator_set(container, efl_new(EFL_UI_ACTIVE_VIEW_INDICATOR_ICON_CLASS)); 96 efl_ui_spotlight_indicator_set(container, efl_new(EFL_UI_SPOTLIGHT_INDICATOR_ICON_CLASS));
97 efl_ui_active_view_manager_set(container, efl_new(EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_STACK_CLASS)); 97 efl_ui_spotlight_manager_set(container, efl_new(EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS));
98 98
99 for (int i = 0; i < IMG_NUM; i++) 99 for (int i = 0; i < IMG_NUM; i++)
100 { 100 {
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index dc13d16a65..774c3ba281 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -227,18 +227,18 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
227# include <efl_ui_panes_eo.h> 227# include <efl_ui_panes_eo.h>
228# include <efl_ui_panes_part.eo.h> 228# include <efl_ui_panes_part.eo.h>
229 229
230#define _EFL_UI_ACTIVE_VIEW_VIEW_MANAGEREO_CLASS_TYPE 230#define _EFL_UI_SPOTLIGHT_MANAGEREO_EO_CLASS_TYPE
231typedef Eo Efl_Ui_Active_View_View_Manager; 231typedef Eo Efl_Ui_Spotlight_Manager;
232#define _EFL_UI_ACTIVE_VIEW_INDICATOR_EO_CLASS_TYPE 232#define _EFL_UI_SPOTLIGHT_INDICATOR_EO_CLASS_TYPE
233typedef Eo Efl_Ui_Active_View_Indicator; 233typedef Eo Efl_Ui_Spotlight_Indicator;
234 234
235# include <efl_ui_active_view_container.eo.h> 235# include <efl_ui_spotlight_container.eo.h>
236# include <efl_ui_active_view_view_manager.eo.h> 236# include <efl_ui_spotlight_manager.eo.h>
237# include <efl_ui_active_view_indicator.eo.h> 237# include <efl_ui_spotlight_indicator.eo.h>
238# include <efl_ui_active_view_indicator_icon.eo.h> 238# include <efl_ui_spotlight_indicator_icon.eo.h>
239# include <efl_ui_active_view_view_manager_scroll.eo.h> 239# include <efl_ui_spotlight_manager_scroll.eo.h>
240# include <efl_ui_active_view_view_manager_stack.eo.h> 240# include <efl_ui_spotlight_manager_stack.eo.h>
241# include <efl_ui_active_view_util.eo.h> 241# include <efl_ui_spotlight_util.eo.h>
242 242
243# include <efl_ui_navigation_bar.eo.h> 243# include <efl_ui_navigation_bar.eo.h>
244# include <efl_ui_navigation_bar_part.eo.h> 244# include <efl_ui_navigation_bar_part.eo.h>
diff --git a/src/lib/elementary/efl_ui_active_view_container.eo b/src/lib/elementary/efl_ui_active_view_container.eo
deleted file mode 100644
index b4c46fee0d..0000000000
--- a/src/lib/elementary/efl_ui_active_view_container.eo
+++ /dev/null
@@ -1,111 +0,0 @@
1struct @beta Efl.Ui.Active_View.Transition_Event {
2 [[Information regarding transition events.]]
3 from : int; [[The view index from where the transition started, -1 if not known.]]
4 to : int; [[The view index to where the transition is headed, -1 if not known.]]
5}
6
7class @beta Efl.Ui.Active_View.Container extends Efl.Ui.Layout_Base implements Efl.Pack_Linear
8{
9 [[The Active View widget is a container for other sub-widgets (views), where only one sub-widget is active at any given time.
10
11 Views are added using the @Efl.Pack_Linear interface and the active view is selected using @.active_index.
12
13 The way the different views are rendered can be customized through the @.view_manager object. For example, only the active view
14 might be shown, or it might be shown in a central position whereas the other views are displayed on the sides, or grayed-out.
15 All views are displayed with the same size, selected with @.active_view_size.
16
17 Additionally, the transition from one view to another can be animated. This animation is also controlled by the @.view_manager object.
18
19 Also, an indicator widget can be used to show a visual cue of how many views are there and which one is the active one.
20
21 This class can be used to create other widgets like Pagers, Tabbed pagers or Stacks, where each view represents a "page" full
22 of other widgets. All these cases can be implemented with a different @.view_manager and use the same @Efl.Ui.Active_View.Container.
23 ]]
24 c_prefix: efl_ui_active_view;
25 methods {
26 @property view_manager {
27 [[This object defines how views are rendered and animated.
28 If it is not set, only the active view is shown and transitions are instantaneous (not animated).
29 ]]
30 values {
31 view_manager : Efl.Ui.Active_View.View_Manager @owned; [[The View Manager object or $NULL.]]
32 }
33 }
34 @property indicator {
35 [[An indicator object to use, which will display the current state of the Active View (number of views and active one).
36 When this object is set, it is immediately updated to reflect the current state of the widget.
37 Its location inside the container is controlled by the @.view_manager.
38 ]]
39 values {
40 indicator : Efl.Ui.Active_View.Indicator @owned; [[The Indicator object or $NULL.]]
41 }
42 }
43 @property active_index {
44 [[Currently active view among all the views added to this widget.
45
46 Changing this value might trigger an animation.
47 ]]
48 values {
49 index: int; [[Index of the active view, from 0 to the number of views - 1 (@Efl.Container.content_count - 1).]]
50 }
51 }
52 @property active_view_size {
53 [[The size to use when displaying the Active View. This is used by the @.view_manager to perform the rendering.
54 Views other than the Active one may or may not use this size.]]
55 values {
56 size: Eina.Size2D; [[Render size for the Active View. (-1, -1) means that all available space inside the container is used.]]
57 }
58 }
59 push @beta {
60 [[Packs a new view at the position indicated by @.active_index (0 by default).
61
62 This is the same behavior as a push operation on a stack.
63
64 An animation might be triggered to make the new active view come into position.
65 ]]
66 params {
67 view : Efl.Gfx.Entity; [[View to add and set to be the active view.]]
68 }
69 }
70 pop @beta {
71 [[Removes the active view from the widget.
72
73 The views behind it naturally flow down so the next one becomes the active view. This is the same behavior as a pop operation on a stack.
74 When combined with @.push you don't have to worry about @.active_index since only the first view is manipulated.
75
76 An animation might be triggered to make the new active view come into position and the old one disappear.
77
78 The removed view can be returned to the caller or deleted (depending on $delete_on_transition_end).
79 ]]
80 params {
81 deletion_on_transition_end : bool; [[ if $true, then the object will be deleted before resolving the future, and a NULL pointer is the value of the future. $false if no operation should be applied to it]]
82 }
83 return : future<Efl.Gfx.Entity>; [[ This Future gets resolved when any transition animation finishes and the popped view is ready for collection.
84 If there is no animation, the Future resolves immediately.
85 If $deletion_on_transition_end is $true then this widget will destroy the popped view and the Future will contain no Value. Otherwise, the caller becomes the owner of the view contained in the Future and must dispose of it appropriately. ]]
86 }
87 }
88 events {
89 transition,start : Efl.Ui.Active_View.Transition_Event; [[A transition animation has started.]]
90 transition,end : Efl.Ui.Active_View.Transition_Event; [[A transition animation has ended.]]
91 }
92 implements {
93 Efl.Object.constructor;
94 Efl.Object.finalize;
95 Efl.Object.invalidate;
96 Efl.Container.content_count;
97 Efl.Container.content_iterate;
98 Efl.Pack.pack_clear;
99 Efl.Pack.unpack_all;
100 Efl.Pack.unpack;
101 Efl.Pack.pack;
102 Efl.Pack_Linear.pack_begin;
103 Efl.Pack_Linear.pack_end;
104 Efl.Pack_Linear.pack_before;
105 Efl.Pack_Linear.pack_after;
106 Efl.Pack_Linear.pack_at;
107 Efl.Pack_Linear.pack_content_get;
108 Efl.Pack_Linear.pack_index_get;
109 Efl.Pack_Linear.pack_unpack_at;
110 }
111}
diff --git a/src/lib/elementary/efl_ui_active_view_indicator_icon.eo b/src/lib/elementary/efl_ui_active_view_indicator_icon.eo
deleted file mode 100644
index 02d89cddcc..0000000000
--- a/src/lib/elementary/efl_ui_active_view_indicator_icon.eo
+++ /dev/null
@@ -1,8 +0,0 @@
1class @beta Efl.Ui.Active_View.Indicator_Icon extends Efl.Ui.Active_View.Indicator {
2 implements {
3 Efl.Ui.Active_View.Indicator.bind;
4 Efl.Ui.Active_View.Indicator.content_del;
5 Efl.Ui.Active_View.Indicator.content_add;
6 Efl.Ui.Active_View.Indicator.position_update;
7 }
8}
diff --git a/src/lib/elementary/efl_ui_active_view_util.c b/src/lib/elementary/efl_ui_active_view_util.c
deleted file mode 100644
index eaf8b48cec..0000000000
--- a/src/lib/elementary/efl_ui_active_view_util.c
+++ /dev/null
@@ -1,21 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include "elementary_config.h"
3#endif
4
5#include <Efl_Ui.h>
6#include "elm_priv.h"
7
8typedef struct {
9
10} Efl_Ui_Active_View_Util_Data;
11
12EOLIAN static Efl_Ui_Active_View_Container*
13_efl_ui_active_view_util_stack_gen(Efl_Ui_Widget *parent)
14{
15 Efl_Ui_Active_View_View_Manager *manager = efl_add(EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_STACK_CLASS, parent);
16 return efl_add(EFL_UI_ACTIVE_VIEW_CONTAINER_CLASS, parent,
17 efl_ui_active_view_manager_set(efl_added, manager));
18}
19
20
21#include "efl_ui_active_view_util.eo.c"
diff --git a/src/lib/elementary/efl_ui_active_view_view_manager_plain.eo b/src/lib/elementary/efl_ui_active_view_view_manager_plain.eo
deleted file mode 100644
index 6c99a3d29a..0000000000
--- a/src/lib/elementary/efl_ui_active_view_view_manager_plain.eo
+++ /dev/null
@@ -1,12 +0,0 @@
1class @beta Efl.Ui.Active_View.View_Manager_Plain extends Efl.Ui.Active_View.View_Manager
2{
3 implements {
4 Efl.Ui.Active_View.View_Manager.bind;
5 Efl.Ui.Active_View.View_Manager.content_add;
6 Efl.Ui.Active_View.View_Manager.content_del;
7 Efl.Ui.Active_View.View_Manager.switch_to;
8 Efl.Ui.Active_View.View_Manager.view_size {set;}
9 Efl.Ui.Active_View.View_Manager.animation_enabled {set; get;}
10 Efl.Object.destructor;
11 }
12}
diff --git a/src/lib/elementary/efl_ui_active_view_view_manager_scroll.eo b/src/lib/elementary/efl_ui_active_view_view_manager_scroll.eo
deleted file mode 100644
index cf90d11349..0000000000
--- a/src/lib/elementary/efl_ui_active_view_view_manager_scroll.eo
+++ /dev/null
@@ -1,12 +0,0 @@
1class @beta Efl.Ui.Active_View.View_Manager_Scroll extends Efl.Ui.Active_View.View_Manager
2{
3 implements {
4 Efl.Ui.Active_View.View_Manager.bind;
5 Efl.Ui.Active_View.View_Manager.content_add;
6 Efl.Ui.Active_View.View_Manager.content_del;
7 Efl.Ui.Active_View.View_Manager.switch_to;
8 Efl.Ui.Active_View.View_Manager.view_size {set;}
9 Efl.Ui.Active_View.View_Manager.animation_enabled {set; get;}
10 Efl.Object.destructor;
11 }
12}
diff --git a/src/lib/elementary/efl_ui_active_view_view_manager_stack.eo b/src/lib/elementary/efl_ui_active_view_view_manager_stack.eo
deleted file mode 100644
index 31c8e43cf8..0000000000
--- a/src/lib/elementary/efl_ui_active_view_view_manager_stack.eo
+++ /dev/null
@@ -1,12 +0,0 @@
1class @beta Efl.Ui.Active_View.View_Manager_Stack extends Efl.Ui.Active_View.View_Manager
2{
3 implements {
4 Efl.Ui.Active_View.View_Manager.bind;
5 Efl.Ui.Active_View.View_Manager.content_add;
6 Efl.Ui.Active_View.View_Manager.content_del;
7 Efl.Ui.Active_View.View_Manager.switch_to;
8 Efl.Ui.Active_View.View_Manager.view_size {set;}
9 Efl.Ui.Active_View.View_Manager.animation_enabled {set; get;}
10 Efl.Object.destructor;
11 }
12}
diff --git a/src/lib/elementary/efl_ui_navigation_bar.c b/src/lib/elementary/efl_ui_navigation_bar.c
index 8f893eb304..6c1de6773a 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.c
+++ b/src/lib/elementary/efl_ui_navigation_bar.c
@@ -19,14 +19,14 @@ _back_button_clicked_cb(void *data, const Efl_Event *ev EINA_UNUSED)
19{ 19{
20 Eo *navigation_bar = data; 20 Eo *navigation_bar = data;
21 21
22 Eo *active_view = efl_provider_find(navigation_bar, EFL_UI_ACTIVE_VIEW_CONTAINER_CLASS); 22 Eo *spotlight = efl_provider_find(navigation_bar, EFL_UI_SPOTLIGHT_CONTAINER_CLASS);
23 if (!active_view) 23 if (!spotlight)
24 { 24 {
25 ERR("Cannot find EFL_UI_ACTIVE_VIEW_CONTAINER_CLASS instance!"); 25 ERR("Cannot find EFL_UI_SPOTLIGHT_CONTAINER_CLASS instance!");
26 return; 26 return;
27 } 27 }
28 28
29 efl_ui_active_view_pop(active_view, EINA_TRUE); 29 efl_ui_spotlight_pop(spotlight, EINA_TRUE);
30} 30}
31 31
32EOLIAN static Eo * 32EOLIAN static Eo *
diff --git a/src/lib/elementary/efl_ui_active_view_container.c b/src/lib/elementary/efl_ui_spotlight_container.c
index 03eca6fab6..9906864d7a 100644
--- a/src/lib/elementary/efl_ui_active_view_container.c
+++ b/src/lib/elementary/efl_ui_spotlight_container.c
@@ -4,9 +4,9 @@
4 4
5#include <Efl_Ui.h> 5#include <Efl_Ui.h>
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include "efl_ui_active_view_view_manager_plain.eo.h" 7#include "efl_ui_spotlight_manager_plain.eo.h"
8 8
9typedef struct _Efl_Ui_Active_View_Container_Data 9typedef struct _Efl_Ui_Spotlight_Container_Data
10{ 10{
11 Eina_List *content_list; 11 Eina_List *content_list;
12 Eo *page_root, *event; 12 Eo *page_root, *event;
@@ -27,21 +27,21 @@ typedef struct _Efl_Ui_Active_View_Container_Data
27 Eina_Promise *transition_done; 27 Eina_Promise *transition_done;
28 Efl_Gfx_Entity *content; 28 Efl_Gfx_Entity *content;
29 } transition_done; 29 } transition_done;
30 Efl_Ui_Active_View_View_Manager *transition; 30 Efl_Ui_Spotlight_Manager *transition;
31 Efl_Ui_Active_View_Indicator *indicator; 31 Efl_Ui_Spotlight_Indicator *indicator;
32 double position; 32 double position;
33 Eina_Bool fill_width: 1; 33 Eina_Bool fill_width: 1;
34 Eina_Bool fill_height: 1; 34 Eina_Bool fill_height: 1;
35 Eina_Bool prevent_transition_interaction : 1; 35 Eina_Bool prevent_transition_interaction : 1;
36} Efl_Ui_Active_View_Container_Data; 36} Efl_Ui_Spotlight_Container_Data;
37 37
38#define MY_CLASS EFL_UI_ACTIVE_VIEW_CONTAINER_CLASS 38#define MY_CLASS EFL_UI_SPOTLIGHT_CONTAINER_CLASS
39 39
40static void _unpack(Eo *obj, Efl_Ui_Active_View_Container_Data *pd, Efl_Gfx_Entity *subobj, int index); 40static void _unpack(Eo *obj, Efl_Ui_Spotlight_Container_Data *pd, Efl_Gfx_Entity *subobj, int index);
41static void _unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Container_Data *pd, Eina_Bool clear); 41static void _unpack_all(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Container_Data *pd, Eina_Bool clear);
42 42
43static int 43static int
44clamp_index(Efl_Ui_Active_View_Container_Data *pd, int index) 44clamp_index(Efl_Ui_Spotlight_Container_Data *pd, int index)
45{ 45{
46 if (index < ((int)eina_list_count(pd->content_list)) * -1) 46 if (index < ((int)eina_list_count(pd->content_list)) * -1)
47 return -1; 47 return -1;
@@ -51,7 +51,7 @@ clamp_index(Efl_Ui_Active_View_Container_Data *pd, int index)
51} 51}
52 52
53static int 53static int
54index_rollover(Efl_Ui_Active_View_Container_Data *pd, int index) 54index_rollover(Efl_Ui_Spotlight_Container_Data *pd, int index)
55{ 55{
56 int c = eina_list_count(pd->content_list); 56 int c = eina_list_count(pd->content_list);
57 if (index < c * -1) 57 if (index < c * -1)
@@ -64,9 +64,9 @@ index_rollover(Efl_Ui_Active_View_Container_Data *pd, int index)
64} 64}
65 65
66static void 66static void
67_transition_end(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Container_Data *pd) 67_transition_end(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Container_Data *pd)
68{ 68{
69 Efl_Ui_Active_View_Transition_Event ev; 69 Efl_Ui_Spotlight_Transition_Event ev;
70 70
71 if (pd->prevent_transition_interaction) return; 71 if (pd->prevent_transition_interaction) return;
72 72
@@ -81,16 +81,16 @@ _transition_end(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Container_Data *pd)
81 81
82 ev.from = pd->show_request.from; 82 ev.from = pd->show_request.from;
83 ev.to = pd->show_request.to; 83 ev.to = pd->show_request.to;
84 efl_event_callback_call(obj, EFL_UI_ACTIVE_VIEW_EVENT_TRANSITION_END, &ev); 84 efl_event_callback_call(obj, EFL_UI_SPOTLIGHT_EVENT_TRANSITION_END, &ev);
85 pd->show_request.active = EINA_FALSE; 85 pd->show_request.active = EINA_FALSE;
86 pd->show_request.from = -1; 86 pd->show_request.from = -1;
87 pd->show_request.to = -1; 87 pd->show_request.to = -1;
88} 88}
89 89
90static void 90static void
91_transition_start(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Container_Data *pd, int from, int to, double progress) 91_transition_start(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Container_Data *pd, int from, int to, double progress)
92{ 92{
93 Efl_Ui_Active_View_Transition_Event ev; 93 Efl_Ui_Spotlight_Transition_Event ev;
94 94
95 if (pd->prevent_transition_interaction) return; 95 if (pd->prevent_transition_interaction) return;
96 96
@@ -103,23 +103,23 @@ _transition_start(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Container_Data *pd, in
103 pd->show_request.last_pos = progress; 103 pd->show_request.last_pos = progress;
104 ev.from = pd->show_request.from; 104 ev.from = pd->show_request.from;
105 ev.to = pd->show_request.to; 105 ev.to = pd->show_request.to;
106 efl_event_callback_call(obj, EFL_UI_ACTIVE_VIEW_EVENT_TRANSITION_START, &ev); 106 efl_event_callback_call(obj, EFL_UI_SPOTLIGHT_EVENT_TRANSITION_START, &ev);
107} 107}
108 108
109static void 109static void
110_position_set(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Container_Data *pd, double progress) 110_position_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Container_Data *pd, double progress)
111{ 111{
112 if (progress < -1.0) progress = -1.0; 112 if (progress < -1.0) progress = -1.0;
113 if (progress > eina_list_count(pd->content_list)) progress = eina_list_count(pd->content_list); 113 if (progress > eina_list_count(pd->content_list)) progress = eina_list_count(pd->content_list);
114 if (pd->indicator) 114 if (pd->indicator)
115 { 115 {
116 efl_ui_active_view_indicator_position_update(pd->indicator, progress); 116 efl_ui_spotlight_indicator_position_update(pd->indicator, progress);
117 } 117 }
118 pd->position = progress; 118 pd->position = progress;
119} 119}
120 120
121static void 121static void
122_transition_event_emission(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Container_Data *pd) 122_transition_event_emission(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Container_Data *pd)
123{ 123{
124 if (pd->show_request.active) 124 if (pd->show_request.active)
125 { 125 {
@@ -146,7 +146,7 @@ _transition_event_emission(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Container_Dat
146static void 146static void
147_resize_cb(void *data, const Efl_Event *ev) 147_resize_cb(void *data, const Efl_Event *ev)
148{ 148{
149 Efl_Ui_Active_View_Container_Data *pd = data; 149 Efl_Ui_Spotlight_Container_Data *pd = data;
150 Eina_Size2D sz; 150 Eina_Size2D sz;
151 151
152 sz = efl_gfx_entity_size_get(ev->object); 152 sz = efl_gfx_entity_size_get(ev->object);
@@ -155,12 +155,12 @@ _resize_cb(void *data, const Efl_Event *ev)
155 if (pd->fill_height) pd->page_spec.sz.h = sz.h; 155 if (pd->fill_height) pd->page_spec.sz.h = sz.h;
156 156
157 if (pd->transition) 157 if (pd->transition)
158 efl_ui_active_view_view_manager_view_size_set(pd->transition, pd->page_spec.sz); 158 efl_ui_spotlight_manager_size_set(pd->transition, pd->page_spec.sz);
159} 159}
160 160
161EOLIAN static Eo * 161EOLIAN static Eo *
162_efl_ui_active_view_container_efl_object_constructor(Eo *obj, 162_efl_ui_spotlight_container_efl_object_constructor(Eo *obj,
163 Efl_Ui_Active_View_Container_Data *pd) 163 Efl_Ui_Spotlight_Container_Data *pd)
164{ 164{
165 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 165 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
166 166
@@ -185,7 +185,7 @@ _efl_ui_active_view_container_efl_object_constructor(Eo *obj,
185 pd->fill_width = EINA_TRUE; 185 pd->fill_width = EINA_TRUE;
186 pd->fill_height = EINA_TRUE; 186 pd->fill_height = EINA_TRUE;
187 187
188 efl_ui_active_view_size_set(obj, EINA_SIZE2D(-1, -1)); 188 efl_ui_spotlight_size_set(obj, EINA_SIZE2D(-1, -1));
189 189
190 elm_widget_can_focus_set(obj, EINA_FALSE); 190 elm_widget_can_focus_set(obj, EINA_FALSE);
191 191
@@ -204,39 +204,39 @@ _efl_ui_active_view_container_efl_object_constructor(Eo *obj,
204} 204}
205 205
206EOLIAN static Efl_Object* 206EOLIAN static Efl_Object*
207_efl_ui_active_view_container_efl_object_finalize(Eo *obj, Efl_Ui_Active_View_Container_Data *pd EINA_UNUSED) 207_efl_ui_spotlight_container_efl_object_finalize(Eo *obj, Efl_Ui_Spotlight_Container_Data *pd EINA_UNUSED)
208{ 208{
209 Efl_Ui_Active_View_View_Manager *manager; 209 Efl_Ui_Spotlight_Manager *manager;
210 210
211 obj = efl_finalize(efl_super(obj, MY_CLASS)); 211 obj = efl_finalize(efl_super(obj, MY_CLASS));
212 212
213 manager = efl_ui_active_view_manager_get(obj); 213 manager = efl_ui_spotlight_manager_get(obj);
214 //set a view manager in case nothing is here 214 //set a view manager in case nothing is here
215 if (!manager) 215 if (!manager)
216 { 216 {
217 Eo *plain; 217 Eo *plain;
218 plain = efl_add(EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_PLAIN_CLASS, obj); 218 plain = efl_add(EFL_UI_SPOTLIGHT_MANAGER_PLAIN_CLASS, obj);
219 efl_ui_active_view_manager_set(obj, plain); 219 efl_ui_spotlight_manager_set(obj, plain);
220 } 220 }
221 else 221 else
222 { 222 {
223 efl_ui_active_view_view_manager_animation_enabled_set(manager, EINA_TRUE); 223 efl_ui_spotlight_manager_animation_enabled_set(manager, EINA_TRUE);
224 } 224 }
225 225
226 return obj; 226 return obj;
227} 227}
228 228
229EOLIAN static void 229EOLIAN static void
230_efl_ui_active_view_container_efl_object_invalidate(Eo *obj, 230_efl_ui_spotlight_container_efl_object_invalidate(Eo *obj,
231 Efl_Ui_Active_View_Container_Data *pd) 231 Efl_Ui_Spotlight_Container_Data *pd)
232{ 232{
233 _unpack_all(obj, pd, EINA_TRUE); 233 _unpack_all(obj, pd, EINA_TRUE);
234 efl_invalidate(efl_super(obj, MY_CLASS)); 234 efl_invalidate(efl_super(obj, MY_CLASS));
235} 235}
236 236
237EOLIAN static int 237EOLIAN static int
238_efl_ui_active_view_container_efl_container_content_count(Eo *obj EINA_UNUSED, 238_efl_ui_spotlight_container_efl_container_content_count(Eo *obj EINA_UNUSED,
239 Efl_Ui_Active_View_Container_Data *pd) 239 Efl_Ui_Spotlight_Container_Data *pd)
240{ 240{
241 return eina_list_count(pd->content_list); 241 return eina_list_count(pd->content_list);
242} 242}
@@ -244,13 +244,13 @@ _efl_ui_active_view_container_efl_container_content_count(Eo *obj EINA_UNUSED,
244static void 244static void
245_child_inv(void *data, const Efl_Event *ev) 245_child_inv(void *data, const Efl_Event *ev)
246{ 246{
247 Efl_Ui_Active_View_Container_Data *pd = efl_data_scope_get(data, MY_CLASS); 247 Efl_Ui_Spotlight_Container_Data *pd = efl_data_scope_get(data, MY_CLASS);
248 int index = eina_list_data_idx(pd->content_list, ev->object); 248 int index = eina_list_data_idx(pd->content_list, ev->object);
249 _unpack(data, pd, ev->object, index); 249 _unpack(data, pd, ev->object, index);
250} 250}
251 251
252static Eina_Bool 252static Eina_Bool
253_register_child(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Container_Data *pd, Efl_Gfx_Entity *subobj) 253_register_child(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Container_Data *pd, Efl_Gfx_Entity *subobj)
254{ 254{
255 EINA_SAFETY_ON_NULL_RETURN_VAL(subobj, EINA_FALSE); 255 EINA_SAFETY_ON_NULL_RETURN_VAL(subobj, EINA_FALSE);
256 if (eina_list_data_find(pd->content_list, subobj)) 256 if (eina_list_data_find(pd->content_list, subobj))
@@ -267,7 +267,7 @@ _register_child(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Container_Data *pd, Efl_
267} 267}
268 268
269static void 269static void
270_update_internals(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Container_Data *pd, Efl_Gfx_Entity *subobj EINA_UNUSED, int index) 270_update_internals(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Container_Data *pd, Efl_Gfx_Entity *subobj EINA_UNUSED, int index)
271{ 271{
272 Eina_Bool curr_page_update = EINA_FALSE; 272 Eina_Bool curr_page_update = EINA_FALSE;
273 273
@@ -279,19 +279,19 @@ _update_internals(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Container_Data *pd, Ef
279 279
280 pd->prevent_transition_interaction = EINA_TRUE; 280 pd->prevent_transition_interaction = EINA_TRUE;
281 if (pd->transition) 281 if (pd->transition)
282 efl_ui_active_view_view_manager_content_add(pd->transition, subobj, index); 282 efl_ui_spotlight_manager_content_add(pd->transition, subobj, index);
283 if (pd->indicator) 283 if (pd->indicator)
284 efl_ui_active_view_indicator_content_add(pd->indicator, subobj, index); 284 efl_ui_spotlight_indicator_content_add(pd->indicator, subobj, index);
285 if (curr_page_update && !pd->transition && eina_list_count(pd->content_list) != 1) 285 if (curr_page_update && !pd->transition && eina_list_count(pd->content_list) != 1)
286 _position_set(obj, pd, pd->curr.page); 286 _position_set(obj, pd, pd->curr.page);
287 pd->prevent_transition_interaction = EINA_FALSE; 287 pd->prevent_transition_interaction = EINA_FALSE;
288 if (eina_list_count(pd->content_list) == 1) 288 if (eina_list_count(pd->content_list) == 1)
289 efl_ui_active_view_active_index_set(obj, 0); 289 efl_ui_spotlight_active_index_set(obj, 0);
290} 290}
291 291
292EOLIAN static Eina_Bool 292EOLIAN static Eina_Bool
293_efl_ui_active_view_container_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED, 293_efl_ui_spotlight_container_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED,
294 Efl_Ui_Active_View_Container_Data *pd, 294 Efl_Ui_Spotlight_Container_Data *pd,
295 Efl_Gfx_Entity *subobj) 295 Efl_Gfx_Entity *subobj)
296{ 296{
297 if (!_register_child(obj, pd, subobj)) return EINA_FALSE; 297 if (!_register_child(obj, pd, subobj)) return EINA_FALSE;
@@ -301,8 +301,8 @@ _efl_ui_active_view_container_efl_pack_linear_pack_begin(Eo *obj EINA_UNUSED,
301} 301}
302 302
303EOLIAN static Eina_Bool 303EOLIAN static Eina_Bool
304_efl_ui_active_view_container_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED, 304_efl_ui_spotlight_container_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED,
305 Efl_Ui_Active_View_Container_Data *pd, 305 Efl_Ui_Spotlight_Container_Data *pd,
306 Efl_Gfx_Entity *subobj) 306 Efl_Gfx_Entity *subobj)
307{ 307{
308 if (!_register_child(obj, pd, subobj)) return EINA_FALSE; 308 if (!_register_child(obj, pd, subobj)) return EINA_FALSE;
@@ -312,8 +312,8 @@ _efl_ui_active_view_container_efl_pack_linear_pack_end(Eo *obj EINA_UNUSED,
312} 312}
313 313
314EOLIAN static Eina_Bool 314EOLIAN static Eina_Bool
315_efl_ui_active_view_container_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED, 315_efl_ui_spotlight_container_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED,
316 Efl_Ui_Active_View_Container_Data *pd, 316 Efl_Ui_Spotlight_Container_Data *pd,
317 Efl_Gfx_Entity *subobj, 317 Efl_Gfx_Entity *subobj,
318 const Efl_Gfx_Entity *existing) 318 const Efl_Gfx_Entity *existing)
319{ 319{
@@ -326,8 +326,8 @@ _efl_ui_active_view_container_efl_pack_linear_pack_before(Eo *obj EINA_UNUSED,
326} 326}
327 327
328EOLIAN static Eina_Bool 328EOLIAN static Eina_Bool
329_efl_ui_active_view_container_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED, 329_efl_ui_spotlight_container_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED,
330 Efl_Ui_Active_View_Container_Data *pd, 330 Efl_Ui_Spotlight_Container_Data *pd,
331 Efl_Gfx_Entity *subobj, 331 Efl_Gfx_Entity *subobj,
332 const Efl_Gfx_Entity *existing) 332 const Efl_Gfx_Entity *existing)
333{ 333{
@@ -340,8 +340,8 @@ _efl_ui_active_view_container_efl_pack_linear_pack_after(Eo *obj EINA_UNUSED,
340} 340}
341 341
342EOLIAN static Eina_Bool 342EOLIAN static Eina_Bool
343_efl_ui_active_view_container_efl_pack_linear_pack_at(Eo *obj, 343_efl_ui_spotlight_container_efl_pack_linear_pack_at(Eo *obj,
344 Efl_Ui_Active_View_Container_Data *pd, 344 Efl_Ui_Spotlight_Container_Data *pd,
345 Efl_Gfx_Entity *subobj, 345 Efl_Gfx_Entity *subobj,
346 int index) 346 int index)
347{ 347{
@@ -372,24 +372,24 @@ _efl_ui_active_view_container_efl_pack_linear_pack_at(Eo *obj,
372} 372}
373 373
374EOLIAN static Efl_Gfx_Entity * 374EOLIAN static Efl_Gfx_Entity *
375_efl_ui_active_view_container_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED, 375_efl_ui_spotlight_container_efl_pack_linear_pack_content_get(Eo *obj EINA_UNUSED,
376 Efl_Ui_Active_View_Container_Data *pd, 376 Efl_Ui_Spotlight_Container_Data *pd,
377 int index) 377 int index)
378{ 378{
379 return eina_list_nth(pd->content_list, index_rollover(pd, index)); 379 return eina_list_nth(pd->content_list, index_rollover(pd, index));
380} 380}
381 381
382EOLIAN static int 382EOLIAN static int
383_efl_ui_active_view_container_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, 383_efl_ui_spotlight_container_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED,
384 Efl_Ui_Active_View_Container_Data *pd, 384 Efl_Ui_Spotlight_Container_Data *pd,
385 const Efl_Gfx_Entity *subobj) 385 const Efl_Gfx_Entity *subobj)
386{ 386{
387 return eina_list_data_idx(pd->content_list, (void *)subobj); 387 return eina_list_data_idx(pd->content_list, (void *)subobj);
388} 388}
389 389
390EOLIAN static void 390EOLIAN static void
391_efl_ui_active_view_container_active_index_set(Eo *obj EINA_UNUSED, 391_efl_ui_spotlight_container_active_index_set(Eo *obj EINA_UNUSED,
392 Efl_Ui_Active_View_Container_Data *pd, 392 Efl_Ui_Spotlight_Container_Data *pd,
393 int index) 393 int index)
394{ 394{
395 int before; 395 int before;
@@ -414,26 +414,26 @@ _efl_ui_active_view_container_active_index_set(Eo *obj EINA_UNUSED,
414 414
415 int old_curr_page = pd->curr.page; 415 int old_curr_page = pd->curr.page;
416 pd->curr.page = index; 416 pd->curr.page = index;
417 efl_ui_active_view_view_manager_switch_to(pd->transition, old_curr_page, pd->curr.page); 417 efl_ui_spotlight_manager_switch_to(pd->transition, old_curr_page, pd->curr.page);
418} 418}
419 419
420EOLIAN static int 420EOLIAN static int
421_efl_ui_active_view_container_active_index_get(const Eo *obj EINA_UNUSED, 421_efl_ui_spotlight_container_active_index_get(const Eo *obj EINA_UNUSED,
422 Efl_Ui_Active_View_Container_Data *pd) 422 Efl_Ui_Spotlight_Container_Data *pd)
423{ 423{
424 return pd->curr.page; 424 return pd->curr.page;
425} 425}
426 426
427EOLIAN Eina_Size2D 427EOLIAN Eina_Size2D
428_efl_ui_active_view_container_active_view_size_get(const Eo *obj EINA_UNUSED, 428_efl_ui_spotlight_container_spotlight_size_get(const Eo *obj EINA_UNUSED,
429 Efl_Ui_Active_View_Container_Data *pd) 429 Efl_Ui_Spotlight_Container_Data *pd)
430{ 430{
431 return pd->page_spec.sz; 431 return pd->page_spec.sz;
432} 432}
433 433
434EOLIAN static void 434EOLIAN static void
435_efl_ui_active_view_container_active_view_size_set(Eo *obj, 435_efl_ui_spotlight_container_spotlight_size_set(Eo *obj,
436 Efl_Ui_Active_View_Container_Data *pd, 436 Efl_Ui_Spotlight_Container_Data *pd,
437 Eina_Size2D sz) 437 Eina_Size2D sz)
438{ 438{
439 Eina_Size2D size; 439 Eina_Size2D size;
@@ -450,12 +450,12 @@ _efl_ui_active_view_container_active_view_size_set(Eo *obj,
450 pd->page_spec.sz.w = size.w; 450 pd->page_spec.sz.w = size.w;
451 451
452 if (pd->transition) 452 if (pd->transition)
453 efl_ui_active_view_view_manager_view_size_set(pd->transition, pd->page_spec.sz); 453 efl_ui_spotlight_manager_size_set(pd->transition, pd->page_spec.sz);
454} 454}
455 455
456static void 456static void
457_unpack_all(Eo *obj EINA_UNUSED, 457_unpack_all(Eo *obj EINA_UNUSED,
458 Efl_Ui_Active_View_Container_Data *pd, 458 Efl_Ui_Spotlight_Container_Data *pd,
459 Eina_Bool clear) 459 Eina_Bool clear)
460{ 460{
461 pd->curr.page = -1; 461 pd->curr.page = -1;
@@ -472,8 +472,8 @@ _unpack_all(Eo *obj EINA_UNUSED,
472} 472}
473 473
474EOLIAN static Eina_Bool 474EOLIAN static Eina_Bool
475_efl_ui_active_view_container_efl_pack_pack_clear(Eo *obj EINA_UNUSED, 475_efl_ui_spotlight_container_efl_pack_pack_clear(Eo *obj EINA_UNUSED,
476 Efl_Ui_Active_View_Container_Data *pd) 476 Efl_Ui_Spotlight_Container_Data *pd)
477{ 477{
478 _unpack_all(obj, pd, EINA_TRUE); 478 _unpack_all(obj, pd, EINA_TRUE);
479 479
@@ -481,8 +481,8 @@ _efl_ui_active_view_container_efl_pack_pack_clear(Eo *obj EINA_UNUSED,
481} 481}
482 482
483EOLIAN static Eina_Bool 483EOLIAN static Eina_Bool
484_efl_ui_active_view_container_efl_pack_unpack_all(Eo *obj EINA_UNUSED, 484_efl_ui_spotlight_container_efl_pack_unpack_all(Eo *obj EINA_UNUSED,
485 Efl_Ui_Active_View_Container_Data *pd) 485 Efl_Ui_Spotlight_Container_Data *pd)
486{ 486{
487 _unpack_all(obj, pd, EINA_FALSE); 487 _unpack_all(obj, pd, EINA_FALSE);
488 488
@@ -491,7 +491,7 @@ _efl_ui_active_view_container_efl_pack_unpack_all(Eo *obj EINA_UNUSED,
491 491
492static void 492static void
493_unpack(Eo *obj, 493_unpack(Eo *obj,
494 Efl_Ui_Active_View_Container_Data *pd, 494 Efl_Ui_Spotlight_Container_Data *pd,
495 Efl_Gfx_Entity *subobj, 495 Efl_Gfx_Entity *subobj,
496 int index) 496 int index)
497{ 497{
@@ -506,9 +506,9 @@ _unpack(Eo *obj,
506 pd->curr.page--; 506 pd->curr.page--;
507 507
508 if (pd->transition) 508 if (pd->transition)
509 efl_ui_active_view_view_manager_content_del(pd->transition, subobj, index); 509 efl_ui_spotlight_manager_content_del(pd->transition, subobj, index);
510 if (pd->indicator) 510 if (pd->indicator)
511 efl_ui_active_view_indicator_content_del(pd->indicator, subobj, index); 511 efl_ui_spotlight_indicator_content_del(pd->indicator, subobj, index);
512 512
513 //we deleted the current index 513 //we deleted the current index
514 if (early_curr_page == index) 514 if (early_curr_page == index)
@@ -519,7 +519,7 @@ _unpack(Eo *obj,
519 if (deletion_of_active && new_curr_page == pd->curr.page) 519 if (deletion_of_active && new_curr_page == pd->curr.page)
520 pd->curr.page = index -1; 520 pd->curr.page = index -1;
521 if (eina_list_count(pd->content_list) > 0 && efl_alive_get(obj)) 521 if (eina_list_count(pd->content_list) > 0 && efl_alive_get(obj))
522 efl_ui_active_view_active_index_set(obj, new_curr_page); 522 efl_ui_spotlight_active_index_set(obj, new_curr_page);
523 else 523 else
524 pd->curr.page = -1; 524 pd->curr.page = -1;
525 } 525 }
@@ -527,14 +527,14 @@ _unpack(Eo *obj,
527 //position has updated 527 //position has updated
528 if (early_curr_page != pd->curr.page && early_curr_page != index && 528 if (early_curr_page != pd->curr.page && early_curr_page != index &&
529 pd->indicator && !pd->transition) 529 pd->indicator && !pd->transition)
530 efl_ui_active_view_indicator_position_update(pd->indicator, pd->curr.page); 530 efl_ui_spotlight_indicator_position_update(pd->indicator, pd->curr.page);
531 531
532 efl_event_callback_del(subobj, EFL_EVENT_INVALIDATE, _child_inv, obj); 532 efl_event_callback_del(subobj, EFL_EVENT_INVALIDATE, _child_inv, obj);
533} 533}
534 534
535EOLIAN static Eina_Bool 535EOLIAN static Eina_Bool
536_efl_ui_active_view_container_efl_pack_unpack(Eo *obj, 536_efl_ui_spotlight_container_efl_pack_unpack(Eo *obj,
537 Efl_Ui_Active_View_Container_Data *pd, 537 Efl_Ui_Spotlight_Container_Data *pd,
538 Efl_Gfx_Entity *subobj) 538 Efl_Gfx_Entity *subobj)
539{ 539{
540 if (!subobj) return EINA_FALSE; 540 if (!subobj) return EINA_FALSE;
@@ -552,8 +552,8 @@ _efl_ui_active_view_container_efl_pack_unpack(Eo *obj,
552} 552}
553 553
554EOLIAN static Efl_Gfx_Entity * 554EOLIAN static Efl_Gfx_Entity *
555_efl_ui_active_view_container_efl_pack_linear_pack_unpack_at(Eo *obj, 555_efl_ui_spotlight_container_efl_pack_linear_pack_unpack_at(Eo *obj,
556 Efl_Ui_Active_View_Container_Data *pd, 556 Efl_Ui_Spotlight_Container_Data *pd,
557 int index) 557 int index)
558{ 558{
559 Efl_Gfx_Entity *subobj = eina_list_nth(pd->content_list, index_rollover(pd, index_rollover(pd, index))); 559 Efl_Gfx_Entity *subobj = eina_list_nth(pd->content_list, index_rollover(pd, index_rollover(pd, index)));
@@ -564,13 +564,13 @@ _efl_ui_active_view_container_efl_pack_linear_pack_unpack_at(Eo *obj,
564} 564}
565 565
566EOLIAN static Eina_Bool 566EOLIAN static Eina_Bool
567_efl_ui_active_view_container_efl_pack_pack(Eo *obj, Efl_Ui_Active_View_Container_Data *pd EINA_UNUSED, Efl_Gfx_Entity *subobj) 567_efl_ui_spotlight_container_efl_pack_pack(Eo *obj, Efl_Ui_Spotlight_Container_Data *pd EINA_UNUSED, Efl_Gfx_Entity *subobj)
568{ 568{
569 return efl_pack_begin(obj, subobj); 569 return efl_pack_begin(obj, subobj);
570} 570}
571 571
572EOLIAN static Eina_Iterator* 572EOLIAN static Eina_Iterator*
573_efl_ui_active_view_container_efl_container_content_iterate(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Container_Data *pd) 573_efl_ui_spotlight_container_efl_container_content_iterate(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Container_Data *pd)
574{ 574{
575 return eina_list_iterator_new(pd->content_list); 575 return eina_list_iterator_new(pd->content_list);
576} 576}
@@ -578,7 +578,7 @@ _efl_ui_active_view_container_efl_container_content_iterate(Eo *obj EINA_UNUSED,
578static void 578static void
579_pos_updated(void *data, const Efl_Event *event) 579_pos_updated(void *data, const Efl_Event *event)
580{ 580{
581 Efl_Ui_Active_View_Container_Data *pd = efl_data_scope_get(data, MY_CLASS); 581 Efl_Ui_Spotlight_Container_Data *pd = efl_data_scope_get(data, MY_CLASS);
582 double progress = *((double*)event->info); 582 double progress = *((double*)event->info);
583 //ignore this here, this could result in unintendet transition,start / end calls 583 //ignore this here, this could result in unintendet transition,start / end calls
584 if (EINA_DBL_EQ(progress, pd->position)) 584 if (EINA_DBL_EQ(progress, pd->position))
@@ -588,16 +588,16 @@ _pos_updated(void *data, const Efl_Event *event)
588} 588}
589 589
590EOLIAN static void 590EOLIAN static void
591_efl_ui_active_view_container_view_manager_set(Eo *obj, Efl_Ui_Active_View_Container_Data *pd, Efl_Ui_Active_View_View_Manager *transition) 591_efl_ui_spotlight_container_spotlight_manager_set(Eo *obj, Efl_Ui_Spotlight_Container_Data *pd, Efl_Ui_Spotlight_Manager *transition)
592{ 592{
593 if (!transition) 593 if (!transition)
594 pd->transition = efl_add(EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_PLAIN_CLASS, obj); 594 pd->transition = efl_add(EFL_UI_SPOTLIGHT_MANAGER_PLAIN_CLASS, obj);
595 else 595 else
596 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(transition, EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_CLASS)); 596 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(transition, EFL_UI_SPOTLIGHT_MANAGER_CLASS));
597 597
598 if (pd->transition) 598 if (pd->transition)
599 { 599 {
600 efl_ui_active_view_view_manager_bind(pd->transition, NULL, NULL); 600 efl_ui_spotlight_manager_bind(pd->transition, NULL, NULL);
601 efl_del(pd->transition); 601 efl_del(pd->transition);
602 } 602 }
603 603
@@ -607,57 +607,57 @@ _efl_ui_active_view_container_view_manager_set(Eo *obj, Efl_Ui_Active_View_Conta
607 { 607 {
608 efl_parent_set(pd->transition, obj); 608 efl_parent_set(pd->transition, obj);
609 //disable animation when not finalized yet, this help reducing the overhead of scheduling a animation that will not be displayed 609 //disable animation when not finalized yet, this help reducing the overhead of scheduling a animation that will not be displayed
610 efl_ui_active_view_view_manager_animation_enabled_set(pd->transition, efl_finalized_get(obj)); 610 efl_ui_spotlight_manager_animation_enabled_set(pd->transition, efl_finalized_get(obj));
611 efl_ui_active_view_view_manager_bind(pd->transition, obj, 611 efl_ui_spotlight_manager_bind(pd->transition, obj,
612 pd->page_root); 612 pd->page_root);
613 efl_ui_active_view_view_manager_view_size_set(pd->transition, pd->page_spec.sz); 613 efl_ui_spotlight_manager_size_set(pd->transition, pd->page_spec.sz);
614 efl_event_callback_add(pd->transition, EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_EVENT_POS_UPDATE, _pos_updated, obj); 614 efl_event_callback_add(pd->transition, EFL_UI_SPOTLIGHT_MANAGER_EVENT_POS_UPDATE, _pos_updated, obj);
615 } 615 }
616 616
617} 617}
618 618
619EOLIAN static Efl_Ui_Active_View_View_Manager* 619EOLIAN static Efl_Ui_Spotlight_Manager*
620_efl_ui_active_view_container_view_manager_get(const Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Container_Data *pd) 620_efl_ui_spotlight_container_spotlight_manager_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Container_Data *pd)
621{ 621{
622 if (efl_isa(pd->transition, EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_PLAIN_CLASS)) 622 if (efl_isa(pd->transition, EFL_UI_SPOTLIGHT_MANAGER_PLAIN_CLASS))
623 return NULL; 623 return NULL;
624 else 624 else
625 return pd->transition; 625 return pd->transition;
626} 626}
627 627
628EOLIAN static void 628EOLIAN static void
629_efl_ui_active_view_container_indicator_set(Eo *obj, Efl_Ui_Active_View_Container_Data *pd, Efl_Ui_Active_View_Indicator *indicator) 629_efl_ui_spotlight_container_indicator_set(Eo *obj, Efl_Ui_Spotlight_Container_Data *pd, Efl_Ui_Spotlight_Indicator *indicator)
630{ 630{
631 if (pd->indicator) 631 if (pd->indicator)
632 { 632 {
633 efl_ui_active_view_indicator_bind(pd->indicator, obj); 633 efl_ui_spotlight_indicator_bind(pd->indicator, obj);
634 efl_del(pd->indicator); 634 efl_del(pd->indicator);
635 } 635 }
636 pd->indicator = indicator; 636 pd->indicator = indicator;
637 if (pd->indicator) 637 if (pd->indicator)
638 { 638 {
639 efl_ui_active_view_indicator_bind(pd->indicator, obj); 639 efl_ui_spotlight_indicator_bind(pd->indicator, obj);
640 if (pd->position != -1) 640 if (pd->position != -1)
641 efl_ui_active_view_indicator_position_update(pd->indicator, pd->position); 641 efl_ui_spotlight_indicator_position_update(pd->indicator, pd->position);
642 } 642 }
643} 643}
644 644
645EOLIAN static Efl_Ui_Active_View_Indicator* 645EOLIAN static Efl_Ui_Spotlight_Indicator*
646_efl_ui_active_view_container_indicator_get(const Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Container_Data *pd) 646_efl_ui_spotlight_container_indicator_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Container_Data *pd)
647{ 647{
648 return pd->indicator; 648 return pd->indicator;
649} 649}
650 650
651EOLIAN static void 651EOLIAN static void
652_efl_ui_active_view_container_push(Eo *obj, Efl_Ui_Active_View_Container_Data *pd EINA_UNUSED, Efl_Gfx_Entity *view) 652_efl_ui_spotlight_container_push(Eo *obj, Efl_Ui_Spotlight_Container_Data *pd EINA_UNUSED, Efl_Gfx_Entity *view)
653{ 653{
654 int old_active_index = efl_ui_active_view_active_index_get(obj); 654 int old_active_index = efl_ui_spotlight_active_index_get(obj);
655 655
656 if (old_active_index == -1) 656 if (old_active_index == -1)
657 old_active_index = 0; 657 old_active_index = 0;
658 658
659 efl_pack_at(obj, view, old_active_index); 659 efl_pack_at(obj, view, old_active_index);
660 efl_ui_active_view_active_index_set(obj, old_active_index); 660 efl_ui_spotlight_active_index_set(obj, old_active_index);
661} 661}
662 662
663static Eina_Value 663static Eina_Value
@@ -669,7 +669,7 @@ _delete_obj(void *data EINA_UNUSED, const Eina_Value value, const Eina_Future *d
669} 669}
670 670
671EOLIAN static Eina_Future* 671EOLIAN static Eina_Future*
672_efl_ui_active_view_container_pop(Eo *obj, Efl_Ui_Active_View_Container_Data *pd, Eina_Bool del) 672_efl_ui_spotlight_container_pop(Eo *obj, Efl_Ui_Spotlight_Container_Data *pd, Eina_Bool del)
673{ 673{
674 Eina_Future *transition_done; 674 Eina_Future *transition_done;
675 int new_index; 675 int new_index;
@@ -677,21 +677,21 @@ _efl_ui_active_view_container_pop(Eo *obj, Efl_Ui_Active_View_Container_Data *pd
677 if (eina_list_count(pd->content_list) < 2) 677 if (eina_list_count(pd->content_list) < 2)
678 new_index = -1; 678 new_index = -1;
679 679
680 new_index = efl_ui_active_view_active_index_get(obj) + 1; 680 new_index = efl_ui_spotlight_active_index_get(obj) + 1;
681 if (new_index >= (int)eina_list_count(pd->content_list)) 681 if (new_index >= (int)eina_list_count(pd->content_list))
682 new_index -= 2; 682 new_index -= 2;
683 683
684 pd->transition_done.content = efl_pack_content_get(obj, efl_ui_active_view_active_index_get(obj)); 684 pd->transition_done.content = efl_pack_content_get(obj, efl_ui_spotlight_active_index_get(obj));
685 pd->transition_done.transition_done = efl_loop_promise_new(obj); 685 pd->transition_done.transition_done = efl_loop_promise_new(obj);
686 686
687 transition_done = eina_future_new(pd->transition_done.transition_done); 687 transition_done = eina_future_new(pd->transition_done.transition_done);
688 if (del) 688 if (del)
689 transition_done = eina_future_then(transition_done, _delete_obj, NULL); 689 transition_done = eina_future_then(transition_done, _delete_obj, NULL);
690 690
691 efl_ui_active_view_active_index_set(obj, new_index); 691 efl_ui_spotlight_active_index_set(obj, new_index);
692 692
693 return transition_done; 693 return transition_done;
694} 694}
695 695
696 696
697#include "efl_ui_active_view_container.eo.c" 697#include "efl_ui_spotlight_container.eo.c"
diff --git a/src/lib/elementary/efl_ui_spotlight_container.eo b/src/lib/elementary/efl_ui_spotlight_container.eo
new file mode 100644
index 0000000000..721304e27f
--- /dev/null
+++ b/src/lib/elementary/efl_ui_spotlight_container.eo
@@ -0,0 +1,111 @@
1struct @beta Efl.Ui.Spotlight.Transition_Event {
2 [[Information regarding transition events.]]
3 from : int; [[The index from where the transition started, -1 if not known.]]
4 to : int; [[The index to where the transition is headed, -1 if not known.]]
5}
6
7class @beta Efl.Ui.Spotlight.Container extends Efl.Ui.Layout_Base implements Efl.Pack_Linear
8{
9 [[The Spotlight widget is a container for other sub-widgets, where only one sub-widget is active at any given time.
10
11 Sub-widgets are added using the @Efl.Pack_Linear interface and the active one (the one in the "spotlight") is selected using @.active_index.
12
13 The way the different sub-widgets are rendered can be customized through the @.spotlight_manager object. For example, only the active sub-widget
14 might be shown, or it might be shown in a central position whereas the other sub-widgets are displayed on the sides, or grayed-out.
15 All sub-widgets are displayed with the same size, selected with @.spotlight_size.
16
17 Additionally, the transition from one sub-widget to another can be animated. This animation is also controlled by the @.spotlight_manager object.
18
19 Also, an indicator widget can be used to show a visual cue of how many sub-widgets are there and which one is the active one.
20
21 This class can be used to create other widgets like Pagers, Tabbed pagers or Stacks, where each sub-widget represents a "page" full
22 of other widgets. All these cases can be implemented with a different @.spotlight_manager and use the same @Efl.Ui.Spotlight.Container.
23 ]]
24 c_prefix: efl_ui_spotlight;
25 methods {
26 @property spotlight_manager {
27 [[This object defines how sub-widgets are rendered and animated.
28 If it is not set, only the active sub-widget is shown and transitions are instantaneous (not animated).
29 ]]
30 values {
31 spotlight_manager : Efl.Ui.Spotlight.Manager @owned; [[The Spotlight Manager object or $NULL.]]
32 }
33 }
34 @property indicator {
35 [[An indicator object to use, which will display the current state of the spotlight (number of sub-widgets and active one).
36 When this object is set, it is immediately updated to reflect the current state of the widget.
37 Its location inside the container is controlled by the @.spotlight_manager.
38 ]]
39 values {
40 indicator : Efl.Ui.Spotlight.Indicator @owned; [[The Indicator object or $NULL.]]
41 }
42 }
43 @property active_index {
44 [[Currently active sub-widget (the one with the spotlight) among all the sub-widgets added to this widget
45
46 Changing this value might trigger an animation.
47 ]]
48 values {
49 index: int; [[Index of the sub-widget that has the spotlight, from 0 to the number of sub-widgets - 1 (@Efl.Container.content_count - 1).]]
50 }
51 }
52 @property spotlight_size {
53 [[The size to use when displaying the Sub-Widget which has the spotlight. This is used by the @.spotlight_manager to perform the rendering.
54 Sub-Widgets other than the Active one may or may not use this size.]]
55 values {
56 size: Eina.Size2D; [[Render size for the spotlight. (-1, -1) means that all available space inside the container is used.]]
57 }
58 }
59 push @beta {
60 [[Packs a new sub-widget at the position indicated by @.active_index (0 by default).
61
62 This is the same behavior as a push operation on a stack.
63
64 An animation might be triggered to give the new sub-widget the spotlight and come into position.
65 ]]
66 params {
67 widget : Efl.Gfx.Entity; [[Sub-Widget to add and set to be the spotlight sub-widget.]]
68 }
69 }
70 pop @beta {
71 [[Removes the sub-widget that has the spotlight from the widget.
72
73 The sub-widgets behind it naturally flow down so the next one gets the spotlight. This is the same behavior as a pop operation on a stack.
74 When combined with @.push you don't have to worry about @.active_index since only the first sub-widget is manipulated.
75
76 An animation might be triggered to give the new sub-widget the spotlight, come into position and the old one disappear.
77
78 The removed sub-widget can be returned to the caller or deleted (depending on $delete_on_transition_end).
79 ]]
80 params {
81 deletion_on_transition_end : bool; [[ if $true, then the object will be deleted before resolving the future, and a NULL pointer is the value of the future. $false if no operation should be applied to it]]
82 }
83 return : future<Efl.Gfx.Entity>; [[ This Future gets resolved when any transition animation finishes and the popped sub-widget is ready for collection.
84 If there is no animation, the Future resolves immediately.
85 If $deletion_on_transition_end is $true then this widget will destroy the popped sub-widget and the Future will contain no Value. Otherwise, the caller becomes the owner of the sub-widget contained in the Future and must dispose of it appropriately. ]]
86 }
87 }
88 events {
89 transition,start : Efl.Ui.Spotlight.Transition_Event; [[A transition animation has started.]]
90 transition,end : Efl.Ui.Spotlight.Transition_Event; [[A transition animation has ended.]]
91 }
92 implements {
93 Efl.Object.constructor;
94 Efl.Object.finalize;
95 Efl.Object.invalidate;
96 Efl.Container.content_count;
97 Efl.Container.content_iterate;
98 Efl.Pack.pack_clear;
99 Efl.Pack.unpack_all;
100 Efl.Pack.unpack;
101 Efl.Pack.pack;
102 Efl.Pack_Linear.pack_begin;
103 Efl.Pack_Linear.pack_end;
104 Efl.Pack_Linear.pack_before;
105 Efl.Pack_Linear.pack_after;
106 Efl.Pack_Linear.pack_at;
107 Efl.Pack_Linear.pack_content_get;
108 Efl.Pack_Linear.pack_index_get;
109 Efl.Pack_Linear.pack_unpack_at;
110 }
111}
diff --git a/src/lib/elementary/efl_ui_active_view_indicator.c b/src/lib/elementary/efl_ui_spotlight_indicator.c
index 3d227f4d16..73c955cf49 100644
--- a/src/lib/elementary/efl_ui_active_view_indicator.c
+++ b/src/lib/elementary/efl_ui_spotlight_indicator.c
@@ -9,7 +9,7 @@
9 9
10typedef struct { 10typedef struct {
11 11
12} Efl_Ui_Active_View_Indicator_Data; 12} Efl_Ui_Spotlight_Indicator_Data;
13 13
14 14
15#include "efl_ui_active_view_indicator.eo.c" 15#include "efl_ui_spotlight_indicator.eo.c"
diff --git a/src/lib/elementary/efl_ui_active_view_indicator.eo b/src/lib/elementary/efl_ui_spotlight_indicator.eo
index 687595106b..230fb5b835 100644
--- a/src/lib/elementary/efl_ui_active_view_indicator.eo
+++ b/src/lib/elementary/efl_ui_spotlight_indicator.eo
@@ -1,25 +1,25 @@
1abstract @beta Efl.Ui.Active_View.Indicator extends Efl.Object { 1abstract @beta Efl.Ui.Spotlight.Indicator extends Efl.Object {
2 [[Object used by @Efl.Ui.Active_View.Container to render an indication of the active view's position among 2 [[Object used by @Efl.Ui.Spotlight.Container to render an indication of the active widgets's position among
3 the rest of the container's views. 3 the rest of the container's widgets.
4 4
5 An example would be Android's little dots in the home screen. 5 An example would be Android's little dots in the home screen.
6 ]] 6 ]]
7 methods { 7 methods {
8 bind @pure_virtual { 8 bind @pure_virtual {
9 [[This method is called the first time an @Efl.Ui.Active_View.Indicator is assigned to an @Efl.Ui.Active_View.Container, binding them together. 9 [[This method is called the first time an @Efl.Ui.Spotlight.Indicator is assigned to an @Efl.Ui.Spotlight.Container, binding them together.
10 10
11 This call can be used to setup the indicator part of the $active_view. 11 This call can be used to setup the indicator part of the $spotlight.
12 12
13 The Active View of the container (if there is any) will be informed to the indicator by a later call to @.position_update. 13 The Active View of the container (if there is any) will be informed to the indicator by a later call to @.position_update.
14 ]] 14 ]]
15 params { 15 params {
16 active_view : Efl.Ui.Active_View.Container; [[The container to bind this indicator to.]] 16 spotlight : Efl.Ui.Spotlight.Container; [[The container to bind this indicator to.]]
17 } 17 }
18 } 18 }
19 content_add @pure_virtual { 19 content_add @pure_virtual {
20 [[A $subobj has been added at position $index in the bound container. 20 [[A $subobj has been added at position $index in the bound container.
21 21
22 The manager should check the container's @Efl.Ui.Active_View.Container.active_index since indices might have 22 The manager should check the container's @Efl.Ui.Spotlight.Container.active_index since indices might have
23 shifted due to the insertion of the new object. 23 shifted due to the insertion of the new object.
24 ]] 24 ]]
25 params { 25 params {
@@ -30,7 +30,7 @@ abstract @beta Efl.Ui.Active_View.Indicator extends Efl.Object {
30 content_del @pure_virtual { 30 content_del @pure_virtual {
31 [[The $subobj at position $index in the bound container has been removed. 31 [[The $subobj at position $index in the bound container has been removed.
32 32
33 The manager should check the container's @Efl.Ui.Active_View.Container.active_index since indices might have 33 The manager should check the container's @Efl.Ui.Spotlight.Container.active_index since indices might have
34 shifted due to the removal of the object. 34 shifted due to the removal of the object.
35 ]] 35 ]]
36 params { 36 params {
@@ -39,7 +39,7 @@ abstract @beta Efl.Ui.Active_View.Indicator extends Efl.Object {
39 } 39 }
40 } 40 }
41 position_update @pure_virtual { 41 position_update @pure_virtual {
42 [[This method tells the indicator that @Efl.Ui.Active_View.Container.active_index has changed in the bound container. 42 [[This method tells the indicator that @Efl.Ui.Spotlight.Container.active_index has changed in the bound container.
43 43
44 $position ranges from -1 to the number of views in the bound container (@Efl.Container.content_count). 44 $position ranges from -1 to the number of views in the bound container (@Efl.Container.content_count).
45 Notice this allows moving to a position before the first view or past the last view, which might happen if the view 45 Notice this allows moving to a position before the first view or past the last view, which might happen if the view
diff --git a/src/lib/elementary/efl_ui_active_view_indicator_icon.c b/src/lib/elementary/efl_ui_spotlight_indicator_icon.c
index 15fa6250e3..2165ec94f7 100644
--- a/src/lib/elementary/efl_ui_active_view_indicator_icon.c
+++ b/src/lib/elementary/efl_ui_spotlight_indicator_icon.c
@@ -9,9 +9,9 @@
9 9
10typedef struct { 10typedef struct {
11 Efl_Ui_Box *indicator; 11 Efl_Ui_Box *indicator;
12 Efl_Ui_Active_View_Container *container; 12 Efl_Ui_Spotlight_Container *container;
13 double last_position; 13 double last_position;
14} Efl_Ui_Active_View_Indicator_Icon_Data; 14} Efl_Ui_Spotlight_Indicator_Icon_Data;
15 15
16static void 16static void
17_flush_state(Eo *item, double val) 17_flush_state(Eo *item, double val)
@@ -22,7 +22,7 @@ _flush_state(Eo *item, double val)
22} 22}
23 23
24static void 24static void
25_add_item(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Indicator_Icon_Data *pd) 25_add_item(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Indicator_Icon_Data *pd)
26{ 26{
27 Efl_Canvas_Layout *item; 27 Efl_Canvas_Layout *item;
28 28
@@ -37,7 +37,7 @@ _add_item(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Indicator_Icon_Data *pd)
37} 37}
38 38
39static void 39static void
40_flush_position(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Indicator_Icon_Data *pd) 40_flush_position(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Indicator_Icon_Data *pd)
41{ 41{
42 int next = -1, closer; 42 int next = -1, closer;
43 double closer_val; 43 double closer_val;
@@ -71,12 +71,12 @@ _flush_position(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Indicator_Icon_Data *pd)
71} 71}
72 72
73EOLIAN static void 73EOLIAN static void
74_efl_ui_active_view_indicator_icon_efl_ui_active_view_indicator_bind(Eo *obj, Efl_Ui_Active_View_Indicator_Icon_Data *pd, Efl_Ui_Active_View_Container *active_view) 74_efl_ui_spotlight_indicator_icon_efl_ui_spotlight_indicator_bind(Eo *obj, Efl_Ui_Spotlight_Indicator_Icon_Data *pd, Efl_Ui_Spotlight_Container *spotlight)
75{ 75{
76 if (active_view) 76 if (spotlight)
77 { 77 {
78 pd->container = active_view; 78 pd->container = spotlight;
79 pd->indicator = efl_add(EFL_UI_BOX_CLASS, active_view); 79 pd->indicator = efl_add(EFL_UI_BOX_CLASS, spotlight);
80 efl_ui_widget_internal_set(pd->indicator, EINA_TRUE); 80 efl_ui_widget_internal_set(pd->indicator, EINA_TRUE);
81 efl_content_set(efl_part(pd->container, "efl.indicator"), pd->indicator); 81 efl_content_set(efl_part(pd->container, "efl.indicator"), pd->indicator);
82 efl_gfx_entity_visible_set(pd->indicator, EINA_TRUE); 82 efl_gfx_entity_visible_set(pd->indicator, EINA_TRUE);
@@ -91,24 +91,24 @@ _efl_ui_active_view_indicator_icon_efl_ui_active_view_indicator_bind(Eo *obj, Ef
91} 91}
92 92
93EOLIAN static void 93EOLIAN static void
94_efl_ui_active_view_indicator_icon_efl_ui_active_view_indicator_content_add(Eo *obj, Efl_Ui_Active_View_Indicator_Icon_Data *pd, Efl_Gfx_Entity *subobj EINA_UNUSED, int index EINA_UNUSED) 94_efl_ui_spotlight_indicator_icon_efl_ui_spotlight_indicator_content_add(Eo *obj, Efl_Ui_Spotlight_Indicator_Icon_Data *pd, Efl_Gfx_Entity *subobj EINA_UNUSED, int index EINA_UNUSED)
95{ 95{
96 _add_item(obj, pd); 96 _add_item(obj, pd);
97 _flush_position(obj, pd); 97 _flush_position(obj, pd);
98} 98}
99 99
100EOLIAN static void 100EOLIAN static void
101_efl_ui_active_view_indicator_icon_efl_ui_active_view_indicator_content_del(Eo *obj, Efl_Ui_Active_View_Indicator_Icon_Data *pd, Efl_Gfx_Entity *subobj EINA_UNUSED, int index EINA_UNUSED) 101_efl_ui_spotlight_indicator_icon_efl_ui_spotlight_indicator_content_del(Eo *obj, Efl_Ui_Spotlight_Indicator_Icon_Data *pd, Efl_Gfx_Entity *subobj EINA_UNUSED, int index EINA_UNUSED)
102{ 102{
103 efl_del(efl_pack_content_get(pd->indicator, 0)); 103 efl_del(efl_pack_content_get(pd->indicator, 0));
104 _flush_position(obj, pd); 104 _flush_position(obj, pd);
105} 105}
106 106
107EOLIAN static void 107EOLIAN static void
108_efl_ui_active_view_indicator_icon_efl_ui_active_view_indicator_position_update(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_Indicator_Icon_Data *pd, double position) 108_efl_ui_spotlight_indicator_icon_efl_ui_spotlight_indicator_position_update(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Indicator_Icon_Data *pd, double position)
109{ 109{
110 pd->last_position = position; 110 pd->last_position = position;
111 _flush_position(obj, pd); 111 _flush_position(obj, pd);
112} 112}
113 113
114#include "efl_ui_active_view_indicator_icon.eo.c" 114#include "efl_ui_spotlight_indicator_icon.eo.c"
diff --git a/src/lib/elementary/efl_ui_spotlight_indicator_icon.eo b/src/lib/elementary/efl_ui_spotlight_indicator_icon.eo
new file mode 100644
index 0000000000..fbd08a6b9d
--- /dev/null
+++ b/src/lib/elementary/efl_ui_spotlight_indicator_icon.eo
@@ -0,0 +1,8 @@
1class @beta Efl.Ui.Spotlight.Indicator_Icon extends Efl.Ui.Spotlight.Indicator {
2 implements {
3 Efl.Ui.Spotlight.Indicator.bind;
4 Efl.Ui.Spotlight.Indicator.content_del;
5 Efl.Ui.Spotlight.Indicator.content_add;
6 Efl.Ui.Spotlight.Indicator.position_update;
7 }
8}
diff --git a/src/lib/elementary/efl_ui_active_view_view_manager.c b/src/lib/elementary/efl_ui_spotlight_manager.c
index e66cd136a4..53bebb21d3 100644
--- a/src/lib/elementary/efl_ui_active_view_view_manager.c
+++ b/src/lib/elementary/efl_ui_spotlight_manager.c
@@ -9,7 +9,7 @@
9 9
10typedef struct { 10typedef struct {
11 11
12} Efl_Ui_Active_View_View_Manager_Data; 12} Efl_Ui_Spotlight_Manager_Data;
13 13
14 14
15#include "efl_ui_active_view_view_manager.eo.c" 15#include "efl_ui_spotlight_manager.eo.c"
diff --git a/src/lib/elementary/efl_ui_active_view_view_manager.eo b/src/lib/elementary/efl_ui_spotlight_manager.eo
index a6f039aaff..3b1d625a59 100644
--- a/src/lib/elementary/efl_ui_active_view_view_manager.eo
+++ b/src/lib/elementary/efl_ui_spotlight_manager.eo
@@ -1,25 +1,25 @@
1abstract @beta Efl.Ui.Active_View.View_Manager extends Efl.Object { 1abstract @beta Efl.Ui.Spotlight.Manager extends Efl.Object {
2 [[Manager object used by @Efl.Ui.Active_View.Container to handle rendering and animation of its views, and user interaction. 2 [[Manager object used by @Efl.Ui.Spotlight.Container to handle rendering and animation of its sub-widgets, and user interaction.
3 3
4 For instance, changes to the currently active view (@Efl.Ui.Active_View.Container.active_index) can be animated with a transition. 4 For instance, changes to the current sub-widget in the spotlight (@Efl.Ui.Spotlight.Container.active_index) can be animated with a transition.
5 This object can also handle user interaction. For example, dragging the active view to one side to get to a different view (like an Android home screen). 5 This object can also handle user interaction. For example, dragging the sub-widget to one side to get to a different sub-widget (like an smartphone home screen).
6 Such user interactions should end up setting a new @Efl.Ui.Active_View.Container.active_index. 6 Such user interactions should end up setting a new @Efl.Ui.Spotlight.Container.active_index.
7 During a transition, the evolution of the current position should be exposed by emitting $pos_update events. 7 During a transition, the evolution of the current position should be exposed by emitting $pos_update events.
8 ]] 8 ]]
9 methods { 9 methods {
10 bind @pure_virtual { 10 bind @pure_virtual {
11 [[This method is called the first time an @Efl.Ui.Active_View.View_Manager is assigned to an @Efl.Ui.Active_View.Container, binding them together. 11 [[This method is called the first time an @Efl.Ui.Spotlight.Manager is assigned to an @Efl.Ui.Spotlight.Container, binding them together.
12 The manager can read the current content of the container, subscribe to events, or do any initialization it requires. 12 The manager can read the current content of the container, subscribe to events, or do any initialization it requires.
13 ]] 13 ]]
14 params { 14 params {
15 active_view : Efl.Ui.Active_View.Container; [[The container to bind the view manager to.]] 15 spotlight : Efl.Ui.Spotlight.Container; [[The container to bind the manager to.]]
16 group : Efl.Canvas.Group; [[The graphical group where the views should be added with @Efl.Canvas.Group.group_member_add and removed with @Efl.Canvas.Group.group_member_remove.]] 16 group : Efl.Canvas.Group; [[The graphical group where the views should be added with @Efl.Canvas.Group.group_member_add and removed with @Efl.Canvas.Group.group_member_remove.]]
17 } 17 }
18 } 18 }
19 content_add @pure_virtual { 19 content_add @pure_virtual {
20 [[A $subobj has been added at position $index in the bound container. 20 [[A $subobj has been added at position $index in the bound container.
21 21
22 The manager should check the container's @Efl.Ui.Active_View.Container.active_index since indices might have 22 The manager should check the container's @Efl.Ui.Spotlight.Container.active_index since indices might have
23 shifted due to the insertion of the new object. 23 shifted due to the insertion of the new object.
24 ]] 24 ]]
25 params { 25 params {
@@ -30,7 +30,7 @@ abstract @beta Efl.Ui.Active_View.View_Manager extends Efl.Object {
30 content_del @pure_virtual { 30 content_del @pure_virtual {
31 [[The $subobj at position $index in the bound container has been removed. 31 [[The $subobj at position $index in the bound container has been removed.
32 32
33 The manager should check the container's @Efl.Ui.Active_View.Container.active_index since indices might have 33 The manager should check the container's @Efl.Ui.Spotlight.Container.active_index since indices might have
34 shifted due to the removal of the object. 34 shifted due to the removal of the object.
35 ]] 35 ]]
36 params { 36 params {
@@ -39,20 +39,20 @@ abstract @beta Efl.Ui.Active_View.View_Manager extends Efl.Object {
39 } 39 }
40 } 40 }
41 switch_to @pure_virtual { 41 switch_to @pure_virtual {
42 [[Switch from one view to another. If there was no previous view, $from might be -1. 42 [[Switch from one sub-widget to another. If there was no previous sub-widget, $from might be -1.
43 This function should display an animation if the @Efl.Ui.Active_View.View_Manager supports them. 43 This function should display an animation if the @Efl.Ui.Spotlight.Manager supports them.
44 ]] 44 ]]
45 params { 45 params {
46 from : int; [[Index of the starting view in the container's list. Might be -1 if unknown.]] 46 from : int; [[Index of the starting sub-widget in the container's list. Might be -1 if unknown.]]
47 to : int; [[Index of the target view in the container's list.]] 47 to : int; [[Index of the target sub-widget in the container's list.]]
48 } 48 }
49 } 49 }
50 @property view_size @pure_virtual { 50 @property size @pure_virtual {
51 [[Will be called whenever the @Efl.Ui.Active_View.Container.active_view_size changes so the @Efl.Ui.Active_View.View_Manager can update itself.]] 51 [[Will be called whenever the @Efl.Ui.Spotlight.Container.spotlight_size changes so the @Efl.Ui.Spotlight.Manager can update itself.]]
52 set { 52 set {
53 } 53 }
54 values { 54 values {
55 size : Eina.Size2D; [[The new size of the views.]] 55 size : Eina.Size2D; [[The new size of the sub-widgets.]]
56 } 56 }
57 } 57 }
58 @property animation_enabled @pure_virtual { 58 @property animation_enabled @pure_virtual {
@@ -63,8 +63,8 @@ abstract @beta Efl.Ui.Active_View.View_Manager extends Efl.Object {
63 } 63 }
64 } 64 }
65 events { 65 events {
66 pos_update : double; [[Index of the view currently being displayed. Fractional values indicate a position in-between views. 66 pos_update : double; [[Index of the sub-widget currently being displayed. Fractional values indicate a position in-between sub-widgets.
67 For instance, when transitioning from view 2 to view 3, this event should be emitted with monotonically 67 For instance, when transitioning from sub-widget 2 to sub-widget 3, this event should be emitted with monotonically
68 increasing values ranging from 2.0 to 3.0. 68 increasing values ranging from 2.0 to 3.0.
69 Animations can perform any movement they want, but the reported $pos_update must move in the same direction.]] 69 Animations can perform any movement they want, but the reported $pos_update must move in the same direction.]]
70 } 70 }
diff --git a/src/lib/elementary/efl_ui_active_view_view_manager_plain.c b/src/lib/elementary/efl_ui_spotlight_manager_plain.c
index ea60d01627..5bbb5238f4 100644
--- a/src/lib/elementary/efl_ui_active_view_view_manager_plain.c
+++ b/src/lib/elementary/efl_ui_spotlight_manager_plain.c
@@ -4,27 +4,27 @@
4 4
5#include <Efl_Ui.h> 5#include <Efl_Ui.h>
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include "efl_ui_active_view_view_manager_plain.eo.h" 7#include "efl_ui_spotlight_manager_plain.eo.h"
8 8
9typedef struct { 9typedef struct {
10 Efl_Ui_Active_View_Container * container; 10 Efl_Ui_Spotlight_Container * container;
11 Efl_Gfx_Entity *group; 11 Efl_Gfx_Entity *group;
12 Eina_Size2D page_size; 12 Eina_Size2D page_size;
13 int current_content; 13 int current_content;
14 Eina_Bool animation; 14 Eina_Bool animation;
15} Efl_Ui_Active_View_View_Manager_Plain_Data; 15} Efl_Ui_Spotlight_Manager_Plain_Data;
16 16
17#define MY_CLASS EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_PLAIN_CLASS 17#define MY_CLASS EFL_UI_SPOTLIGHT_MANAGER_PLAIN_CLASS
18 18
19static void 19static void
20_emit_position(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_View_Manager_Plain_Data *pd) 20_emit_position(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd)
21{ 21{
22 double absolut_position = pd->current_content; 22 double absolut_position = pd->current_content;
23 efl_event_callback_call(obj, EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_EVENT_POS_UPDATE, &absolut_position); 23 efl_event_callback_call(obj, EFL_UI_SPOTLIGHT_MANAGER_EVENT_POS_UPDATE, &absolut_position);
24} 24}
25 25
26static void 26static void
27_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_View_Manager_Plain_Data *pd) 27_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd)
28{ 28{
29 Efl_Gfx_Entity *entity = efl_pack_content_get(pd->container, pd->current_content); 29 Efl_Gfx_Entity *entity = efl_pack_content_get(pd->container, pd->current_content);
30 Eina_Rect group_pos = efl_gfx_entity_geometry_get(pd->group); 30 Eina_Rect group_pos = efl_gfx_entity_geometry_get(pd->group);
@@ -54,23 +54,23 @@ EFL_CALLBACKS_ARRAY_DEFINE(group_callback,
54) 54)
55 55
56EOLIAN static void 56EOLIAN static void
57_efl_ui_active_view_view_manager_plain_efl_ui_active_view_view_manager_bind(Eo *obj, Efl_Ui_Active_View_View_Manager_Plain_Data *pd, Efl_Ui_Active_View_Container *active_view, Efl_Canvas_Group *group) 57_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd, Efl_Ui_Spotlight_Container *spotlight, Efl_Canvas_Group *group)
58{ 58{
59 if (active_view && group) 59 if (spotlight && group)
60 { 60 {
61 int index; 61 int index;
62 62
63 pd->container = active_view; 63 pd->container = spotlight;
64 pd->group = group; 64 pd->group = group;
65 65
66 efl_event_callback_array_add(pd->group, group_callback(), obj); 66 efl_event_callback_array_add(pd->group, group_callback(), obj);
67 67
68 for (int i = 0; i < efl_content_count(active_view) ; ++i) { 68 for (int i = 0; i < efl_content_count(spotlight) ; ++i) {
69 Efl_Gfx_Entity *elem = efl_pack_content_get(active_view, i); 69 Efl_Gfx_Entity *elem = efl_pack_content_get(spotlight, i);
70 efl_canvas_group_member_add(pd->group, elem); 70 efl_canvas_group_member_add(pd->group, elem);
71 efl_gfx_entity_visible_set(elem, EINA_FALSE); 71 efl_gfx_entity_visible_set(elem, EINA_FALSE);
72 } 72 }
73 index = efl_ui_active_view_active_index_get(active_view); 73 index = efl_ui_spotlight_active_index_get(spotlight);
74 if (index != -1) 74 if (index != -1)
75 { 75 {
76 pd->current_content = index; 76 pd->current_content = index;
@@ -82,12 +82,12 @@ _efl_ui_active_view_view_manager_plain_efl_ui_active_view_view_manager_bind(Eo *
82} 82}
83 83
84static void 84static void
85_content_changed(Eo *obj, Efl_Ui_Active_View_View_Manager_Plain_Data *pd) 85_content_changed(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd)
86{ 86{
87 if (efl_ui_active_view_active_index_get(pd->container) != pd->current_content) 87 if (efl_ui_spotlight_active_index_get(pd->container) != pd->current_content)
88 { 88 {
89 int old_current_content = pd->current_content; 89 int old_current_content = pd->current_content;
90 pd->current_content = efl_ui_active_view_active_index_get(pd->container); 90 pd->current_content = efl_ui_spotlight_active_index_get(pd->container);
91 efl_gfx_entity_visible_set(efl_pack_content_get(pd->container, old_current_content), EINA_FALSE); 91 efl_gfx_entity_visible_set(efl_pack_content_get(pd->container, old_current_content), EINA_FALSE);
92 efl_gfx_entity_visible_set(efl_pack_content_get(pd->container, pd->current_content), EINA_TRUE); 92 efl_gfx_entity_visible_set(efl_pack_content_get(pd->container, pd->current_content), EINA_TRUE);
93 _geom_sync(obj, pd); 93 _geom_sync(obj, pd);
@@ -96,7 +96,7 @@ _content_changed(Eo *obj, Efl_Ui_Active_View_View_Manager_Plain_Data *pd)
96} 96}
97 97
98EOLIAN static void 98EOLIAN static void
99_efl_ui_active_view_view_manager_plain_efl_ui_active_view_view_manager_content_add(Eo *obj, Efl_Ui_Active_View_View_Manager_Plain_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) 99_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_content_add(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED)
100{ 100{
101 efl_canvas_group_member_add(pd->group, subobj); 101 efl_canvas_group_member_add(pd->group, subobj);
102 efl_gfx_entity_visible_set(subobj, EINA_FALSE); 102 efl_gfx_entity_visible_set(subobj, EINA_FALSE);
@@ -104,13 +104,13 @@ _efl_ui_active_view_view_manager_plain_efl_ui_active_view_view_manager_content_a
104} 104}
105 105
106EOLIAN static void 106EOLIAN static void
107_efl_ui_active_view_view_manager_plain_efl_ui_active_view_view_manager_content_del(Eo *obj, Efl_Ui_Active_View_View_Manager_Plain_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) 107_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_content_del(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED)
108{ 108{
109 efl_canvas_group_member_remove(pd->group, subobj); 109 efl_canvas_group_member_remove(pd->group, subobj);
110 _content_changed(obj, pd); 110 _content_changed(obj, pd);
111} 111}
112EOLIAN static void 112EOLIAN static void
113_efl_ui_active_view_view_manager_plain_efl_ui_active_view_view_manager_switch_to(Eo *obj, Efl_Ui_Active_View_View_Manager_Plain_Data *pd, int from EINA_UNUSED, int to) 113_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd, int from EINA_UNUSED, int to)
114{ 114{
115 Efl_Gfx_Entity *to_obj, *from_obj; 115 Efl_Gfx_Entity *to_obj, *from_obj;
116 to_obj = efl_pack_content_get(pd->container, to); 116 to_obj = efl_pack_content_get(pd->container, to);
@@ -132,14 +132,14 @@ _efl_ui_active_view_view_manager_plain_efl_ui_active_view_view_manager_switch_to
132} 132}
133 133
134EOLIAN static void 134EOLIAN static void
135_efl_ui_active_view_view_manager_plain_efl_ui_active_view_view_manager_view_size_set(Eo *obj, Efl_Ui_Active_View_View_Manager_Plain_Data *pd, Eina_Size2D size) 135_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_size_set(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd, Eina_Size2D size)
136{ 136{
137 pd->page_size = size; 137 pd->page_size = size;
138 _geom_sync(obj, pd); 138 _geom_sync(obj, pd);
139} 139}
140 140
141EOLIAN static void 141EOLIAN static void
142_efl_ui_active_view_view_manager_plain_efl_object_destructor(Eo *obj, Efl_Ui_Active_View_View_Manager_Plain_Data *pd EINA_UNUSED) 142_efl_ui_spotlight_manager_plain_efl_object_destructor(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd EINA_UNUSED)
143{ 143{
144 efl_destructor(efl_super(obj, MY_CLASS)); 144 efl_destructor(efl_super(obj, MY_CLASS));
145 145
@@ -153,16 +153,16 @@ _efl_ui_active_view_view_manager_plain_efl_object_destructor(Eo *obj, Efl_Ui_Act
153} 153}
154 154
155EOLIAN static void 155EOLIAN static void
156_efl_ui_active_view_view_manager_plain_efl_ui_active_view_view_manager_animation_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_View_Manager_Plain_Data *pd, Eina_Bool animation) 156_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_animation_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd, Eina_Bool animation)
157{ 157{
158 pd->animation = animation; 158 pd->animation = animation;
159} 159}
160 160
161EOLIAN static Eina_Bool 161EOLIAN static Eina_Bool
162_efl_ui_active_view_view_manager_plain_efl_ui_active_view_view_manager_animation_enabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Active_View_View_Manager_Plain_Data *pd) 162_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_animation_enabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd)
163{ 163{
164 return pd->animation; 164 return pd->animation;
165} 165}
166 166
167 167
168#include "efl_ui_active_view_view_manager_plain.eo.c" 168#include "efl_ui_spotlight_manager_plain.eo.c"
diff --git a/src/lib/elementary/efl_ui_spotlight_manager_plain.eo b/src/lib/elementary/efl_ui_spotlight_manager_plain.eo
new file mode 100644
index 0000000000..3556145da2
--- /dev/null
+++ b/src/lib/elementary/efl_ui_spotlight_manager_plain.eo
@@ -0,0 +1,12 @@
1class @beta Efl.Ui.Spotlight.Manager_Plain extends Efl.Ui.Spotlight.Manager
2{
3 implements {
4 Efl.Ui.Spotlight.Manager.bind;
5 Efl.Ui.Spotlight.Manager.content_add;
6 Efl.Ui.Spotlight.Manager.content_del;
7 Efl.Ui.Spotlight.Manager.switch_to;
8 Efl.Ui.Spotlight.Manager.size {set;}
9 Efl.Ui.Spotlight.Manager.animation_enabled {set; get;}
10 Efl.Object.destructor;
11 }
12}
diff --git a/src/lib/elementary/efl_ui_active_view_view_manager_scroll.c b/src/lib/elementary/efl_ui_spotlight_manager_scroll.c
index 9bff559dbb..4e64b81cff 100644
--- a/src/lib/elementary/efl_ui_active_view_view_manager_scroll.c
+++ b/src/lib/elementary/efl_ui_spotlight_manager_scroll.c
@@ -6,7 +6,7 @@
6#include "elm_priv.h" 6#include "elm_priv.h"
7 7
8typedef struct { 8typedef struct {
9 Efl_Ui_Active_View_Container * container; 9 Efl_Ui_Spotlight_Container * container;
10 Efl_Gfx_Entity *group, *foreclip, *backclip; 10 Efl_Gfx_Entity *group, *foreclip, *backclip;
11 Eina_Size2D page_size; 11 Eina_Size2D page_size;
12 struct { 12 struct {
@@ -22,20 +22,20 @@ typedef struct {
22 Eina_Position2D mouse_start; 22 Eina_Position2D mouse_start;
23 } mouse_move; 23 } mouse_move;
24 Eina_Bool animation; 24 Eina_Bool animation;
25} Efl_Ui_Active_View_View_Manager_Scroll_Data; 25} Efl_Ui_Spotlight_Manager_Scroll_Data;
26 26
27#define MY_CLASS EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_SCROLL_CLASS 27#define MY_CLASS EFL_UI_SPOTLIGHT_MANAGER_SCROLL_CLASS
28 28
29static void _page_set_animation(void *data, const Efl_Event *event); 29static void _page_set_animation(void *data, const Efl_Event *event);
30 30
31static void 31static void
32_propagate_progress(Eo *obj, double pos) 32_propagate_progress(Eo *obj, double pos)
33{ 33{
34 efl_event_callback_call(obj, EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_EVENT_POS_UPDATE, &pos); 34 efl_event_callback_call(obj, EFL_UI_SPOTLIGHT_MANAGER_EVENT_POS_UPDATE, &pos);
35} 35}
36 36
37static void 37static void
38_apply_box_properties(Eo *obj, Efl_Ui_Active_View_View_Manager_Scroll_Data *pd) 38_apply_box_properties(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd)
39{ 39{
40 Eina_Rect geometry = EINA_RECT_EMPTY(); 40 Eina_Rect geometry = EINA_RECT_EMPTY();
41 Eina_Rect group_pos = efl_gfx_entity_geometry_get(pd->group); 41 Eina_Rect group_pos = efl_gfx_entity_geometry_get(pd->group);
@@ -44,7 +44,7 @@ _apply_box_properties(Eo *obj, Efl_Ui_Active_View_View_Manager_Scroll_Data *pd)
44 if (pd->transition.active) 44 if (pd->transition.active)
45 current_pos = pd->transition.from + ((double)pd->transition.to - pd->transition.from)*pd->transition.progress; 45 current_pos = pd->transition.from + ((double)pd->transition.to - pd->transition.from)*pd->transition.progress;
46 else 46 else
47 current_pos = efl_ui_active_view_active_index_get(pd->container); 47 current_pos = efl_ui_spotlight_active_index_get(pd->container);
48 48
49 efl_gfx_entity_geometry_set(pd->foreclip, group_pos); 49 efl_gfx_entity_geometry_set(pd->foreclip, group_pos);
50 //first calculate the size 50 //first calculate the size
@@ -78,13 +78,13 @@ _apply_box_properties(Eo *obj, Efl_Ui_Active_View_View_Manager_Scroll_Data *pd)
78static void 78static void
79_resize_cb(void *data, const Efl_Event *ev EINA_UNUSED) 79_resize_cb(void *data, const Efl_Event *ev EINA_UNUSED)
80{ 80{
81 _apply_box_properties(data, efl_data_scope_get(data, EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_SCROLL_CLASS)); 81 _apply_box_properties(data, efl_data_scope_get(data, EFL_UI_SPOTLIGHT_MANAGER_SCROLL_CLASS));
82} 82}
83 83
84static void 84static void
85_move_cb(void *data, const Efl_Event *ev EINA_UNUSED) 85_move_cb(void *data, const Efl_Event *ev EINA_UNUSED)
86{ 86{
87 _apply_box_properties(data, efl_data_scope_get(data, EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_SCROLL_CLASS)); 87 _apply_box_properties(data, efl_data_scope_get(data, EFL_UI_SPOTLIGHT_MANAGER_SCROLL_CLASS));
88} 88}
89 89
90static void 90static void
@@ -93,7 +93,7 @@ _mouse_down_cb(void *data,
93{ 93{
94 Efl_Input_Pointer *ev = event->info; 94 Efl_Input_Pointer *ev = event->info;
95 Eo *obj = data; 95 Eo *obj = data;
96 Efl_Ui_Active_View_View_Manager_Scroll_Data *pd = efl_data_scope_get(obj, MY_CLASS); 96 Efl_Ui_Spotlight_Manager_Scroll_Data *pd = efl_data_scope_get(obj, MY_CLASS);
97 97
98 if (efl_input_pointer_button_get(ev) != 1) return; 98 if (efl_input_pointer_button_get(ev) != 1) return;
99 if (efl_input_event_flags_get(ev) & EFL_INPUT_FLAGS_PROCESSED) return; 99 if (efl_input_event_flags_get(ev) & EFL_INPUT_FLAGS_PROCESSED) return;
@@ -103,7 +103,7 @@ _mouse_down_cb(void *data,
103 efl_event_callback_del(pd->container, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK, _page_set_animation, obj); 103 efl_event_callback_del(pd->container, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK, _page_set_animation, obj);
104 104
105 pd->mouse_move.active = EINA_TRUE; 105 pd->mouse_move.active = EINA_TRUE;
106 pd->mouse_move.from = efl_ui_active_view_active_index_get(pd->container); 106 pd->mouse_move.from = efl_ui_spotlight_active_index_get(pd->container);
107 pd->mouse_move.mouse_start = efl_input_pointer_position_get(ev); 107 pd->mouse_move.mouse_start = efl_input_pointer_position_get(ev);
108 108
109 pd->transition.from = pd->mouse_move.from; 109 pd->transition.from = pd->mouse_move.from;
@@ -117,7 +117,7 @@ _mouse_move_cb(void *data,
117{ 117{
118 Efl_Input_Pointer *ev = event->info; 118 Efl_Input_Pointer *ev = event->info;
119 Eo *obj = data; 119 Eo *obj = data;
120 Efl_Ui_Active_View_View_Manager_Scroll_Data *pd = efl_data_scope_get(obj, MY_CLASS); 120 Efl_Ui_Spotlight_Manager_Scroll_Data *pd = efl_data_scope_get(obj, MY_CLASS);
121 Eina_Position2D pos; 121 Eina_Position2D pos;
122 int pos_y_diff; 122 int pos_y_diff;
123 123
@@ -141,7 +141,7 @@ _mouse_up_cb(void *data,
141{ 141{
142 Efl_Input_Pointer *ev = event->info; 142 Efl_Input_Pointer *ev = event->info;
143 Eo *obj = data; 143 Eo *obj = data;
144 Efl_Ui_Active_View_View_Manager_Scroll_Data *pd = efl_data_scope_get(obj, MY_CLASS); 144 Efl_Ui_Spotlight_Manager_Scroll_Data *pd = efl_data_scope_get(obj, MY_CLASS);
145 145
146 if (efl_input_event_flags_get(ev) & EFL_INPUT_FLAGS_PROCESSED) return; 146 if (efl_input_event_flags_get(ev) & EFL_INPUT_FLAGS_PROCESSED) return;
147 if (!pd->mouse_move.active) return; 147 if (!pd->mouse_move.active) return;
@@ -149,7 +149,7 @@ _mouse_up_cb(void *data,
149 double absolut_current_position = (double)pd->transition.from + pd->transition.progress; 149 double absolut_current_position = (double)pd->transition.from + pd->transition.progress;
150 int result = round(absolut_current_position); 150 int result = round(absolut_current_position);
151 151
152 efl_ui_active_view_active_index_set(pd->container, MIN(MAX(result, 0), efl_content_count(pd->container) - 1)); 152 efl_ui_spotlight_active_index_set(pd->container, MIN(MAX(result, 0), efl_content_count(pd->container) - 1));
153} 153}
154 154
155EFL_CALLBACKS_ARRAY_DEFINE(mouse_listeners, 155EFL_CALLBACKS_ARRAY_DEFINE(mouse_listeners,
@@ -159,11 +159,11 @@ EFL_CALLBACKS_ARRAY_DEFINE(mouse_listeners,
159); 159);
160 160
161EOLIAN static void 161EOLIAN static void
162_efl_ui_active_view_view_manager_scroll_efl_ui_active_view_view_manager_bind(Eo *obj, Efl_Ui_Active_View_View_Manager_Scroll_Data *pd, Efl_Ui_Active_View_Container *active_view, Efl_Canvas_Group *group) 162_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, Efl_Ui_Spotlight_Container *spotlight, Efl_Canvas_Group *group)
163{ 163{
164 if (active_view && group) 164 if (spotlight && group)
165 { 165 {
166 pd->container = active_view; 166 pd->container = spotlight;
167 pd->group = group; 167 pd->group = group;
168 efl_event_callback_add(pd->group, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj); 168 efl_event_callback_add(pd->group, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj);
169 efl_event_callback_add(pd->group, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, obj); 169 efl_event_callback_add(pd->group, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, obj);
@@ -177,8 +177,8 @@ _efl_ui_active_view_view_manager_scroll_efl_ui_active_view_view_manager_bind(Eo
177 evas_object_static_clip_set(pd->backclip, EINA_TRUE); 177 evas_object_static_clip_set(pd->backclip, EINA_TRUE);
178 efl_gfx_entity_visible_set(pd->backclip, EINA_FALSE); 178 efl_gfx_entity_visible_set(pd->backclip, EINA_FALSE);
179 179
180 for (int i = 0; i < efl_content_count(active_view) ; ++i) { 180 for (int i = 0; i < efl_content_count(spotlight) ; ++i) {
181 Efl_Gfx_Entity *elem = efl_pack_content_get(active_view, i); 181 Efl_Gfx_Entity *elem = efl_pack_content_get(spotlight, i);
182 efl_canvas_object_clipper_set(elem, pd->backclip); 182 efl_canvas_object_clipper_set(elem, pd->backclip);
183 efl_canvas_group_member_add(pd->group, elem); 183 efl_canvas_group_member_add(pd->group, elem);
184 efl_gfx_entity_visible_set(elem, EINA_TRUE); 184 efl_gfx_entity_visible_set(elem, EINA_TRUE);
@@ -191,7 +191,7 @@ _efl_ui_active_view_view_manager_scroll_efl_ui_active_view_view_manager_bind(Eo
191} 191}
192 192
193EOLIAN static void 193EOLIAN static void
194_efl_ui_active_view_view_manager_scroll_efl_ui_active_view_view_manager_content_add(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_View_Manager_Scroll_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) 194_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_content_add(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED)
195{ 195{
196 efl_gfx_entity_visible_set(subobj, EINA_TRUE); 196 efl_gfx_entity_visible_set(subobj, EINA_TRUE);
197 efl_canvas_object_clipper_set(subobj, pd->backclip); 197 efl_canvas_object_clipper_set(subobj, pd->backclip);
@@ -203,7 +203,7 @@ _efl_ui_active_view_view_manager_scroll_efl_ui_active_view_view_manager_content_
203 203
204 204
205EOLIAN static void 205EOLIAN static void
206_efl_ui_active_view_view_manager_scroll_efl_ui_active_view_view_manager_content_del(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_View_Manager_Scroll_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) 206_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_content_del(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED)
207{ 207{
208 efl_canvas_object_clipper_set(subobj, NULL); 208 efl_canvas_object_clipper_set(subobj, NULL);
209 efl_canvas_group_member_remove(pd->group, subobj); 209 efl_canvas_group_member_remove(pd->group, subobj);
@@ -215,7 +215,7 @@ _efl_ui_active_view_view_manager_scroll_efl_ui_active_view_view_manager_content_
215static void 215static void
216_page_set_animation(void *data, const Efl_Event *event EINA_UNUSED) 216_page_set_animation(void *data, const Efl_Event *event EINA_UNUSED)
217{ 217{
218 Efl_Ui_Active_View_View_Manager_Scroll_Data *pd = efl_data_scope_get(data, MY_CLASS); 218 Efl_Ui_Spotlight_Manager_Scroll_Data *pd = efl_data_scope_get(data, MY_CLASS);
219 double p = (ecore_loop_time_get() - pd->transition.start_time) / pd->transition.max_time; 219 double p = (ecore_loop_time_get() - pd->transition.start_time) / pd->transition.max_time;
220 220
221 if (p >= 1.0) p = 1.0; 221 if (p >= 1.0) p = 1.0;
@@ -234,7 +234,7 @@ _page_set_animation(void *data, const Efl_Event *event EINA_UNUSED)
234} 234}
235 235
236static void 236static void
237_animation_request_switch(Eo *obj, Efl_Ui_Active_View_View_Manager_Scroll_Data *pd, int from, int to) 237_animation_request_switch(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, int from, int to)
238{ 238{
239 //if there is already a transition ongoing, which is no mouse transition, but goes to the same position, then do nothing 239 //if there is already a transition ongoing, which is no mouse transition, but goes to the same position, then do nothing
240 if (pd->transition.active && !pd->mouse_move.active && pd->transition.to == to) 240 if (pd->transition.active && !pd->mouse_move.active && pd->transition.to == to)
@@ -269,7 +269,7 @@ _animation_request_switch(Eo *obj, Efl_Ui_Active_View_View_Manager_Scroll_Data *
269} 269}
270 270
271EOLIAN static void 271EOLIAN static void
272_efl_ui_active_view_view_manager_scroll_efl_ui_active_view_view_manager_switch_to(Eo *obj, Efl_Ui_Active_View_View_Manager_Scroll_Data *pd, int from, int to) 272_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, int from, int to)
273{ 273{
274 if (pd->animation) 274 if (pd->animation)
275 { 275 {
@@ -285,7 +285,7 @@ _efl_ui_active_view_view_manager_scroll_efl_ui_active_view_view_manager_switch_t
285} 285}
286 286
287EOLIAN static void 287EOLIAN static void
288_efl_ui_active_view_view_manager_scroll_efl_ui_active_view_view_manager_view_size_set(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_View_Manager_Scroll_Data *pd, Eina_Size2D size) 288_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_size_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, Eina_Size2D size)
289{ 289{
290 pd->page_size = size; 290 pd->page_size = size;
291 if (!pd->transition.active) 291 if (!pd->transition.active)
@@ -293,7 +293,7 @@ _efl_ui_active_view_view_manager_scroll_efl_ui_active_view_view_manager_view_siz
293} 293}
294 294
295EOLIAN static void 295EOLIAN static void
296_efl_ui_active_view_view_manager_scroll_efl_ui_active_view_view_manager_animation_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_View_Manager_Scroll_Data *pd, Eina_Bool animation) 296_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_animation_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, Eina_Bool animation)
297{ 297{
298 pd->animation = animation; 298 pd->animation = animation;
299 if (pd->transition.active && !animation) 299 if (pd->transition.active && !animation)
@@ -305,14 +305,14 @@ _efl_ui_active_view_view_manager_scroll_efl_ui_active_view_view_manager_animatio
305} 305}
306 306
307EOLIAN static Eina_Bool 307EOLIAN static Eina_Bool
308_efl_ui_active_view_view_manager_scroll_efl_ui_active_view_view_manager_animation_enabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Active_View_View_Manager_Scroll_Data *pd) 308_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_animation_enabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd)
309{ 309{
310 return pd->animation; 310 return pd->animation;
311} 311}
312 312
313 313
314EOLIAN static void 314EOLIAN static void
315_efl_ui_active_view_view_manager_scroll_efl_object_destructor(Eo *obj, Efl_Ui_Active_View_View_Manager_Scroll_Data *pd EINA_UNUSED) 315_efl_ui_spotlight_manager_scroll_efl_object_destructor(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd EINA_UNUSED)
316{ 316{
317 efl_event_callback_del(pd->group, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj); 317 efl_event_callback_del(pd->group, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj);
318 efl_event_callback_del(pd->group, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, obj); 318 efl_event_callback_del(pd->group, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, obj);
@@ -329,4 +329,4 @@ _efl_ui_active_view_view_manager_scroll_efl_object_destructor(Eo *obj, Efl_Ui_Ac
329} 329}
330 330
331 331
332#include "efl_ui_active_view_view_manager_scroll.eo.c" 332#include "efl_ui_spotlight_manager_scroll.eo.c"
diff --git a/src/lib/elementary/efl_ui_spotlight_manager_scroll.eo b/src/lib/elementary/efl_ui_spotlight_manager_scroll.eo
new file mode 100644
index 0000000000..8ba9ac6597
--- /dev/null
+++ b/src/lib/elementary/efl_ui_spotlight_manager_scroll.eo
@@ -0,0 +1,12 @@
1class @beta Efl.Ui.Spotlight.Manager_Scroll extends Efl.Ui.Spotlight.Manager
2{
3 implements {
4 Efl.Ui.Spotlight.Manager.bind;
5 Efl.Ui.Spotlight.Manager.content_add;
6 Efl.Ui.Spotlight.Manager.content_del;
7 Efl.Ui.Spotlight.Manager.switch_to;
8 Efl.Ui.Spotlight.Manager.size {set;}
9 Efl.Ui.Spotlight.Manager.animation_enabled {set; get;}
10 Efl.Object.destructor;
11 }
12}
diff --git a/src/lib/elementary/efl_ui_active_view_view_manager_stack.c b/src/lib/elementary/efl_ui_spotlight_manager_stack.c
index 769540d590..ceff490f69 100644
--- a/src/lib/elementary/efl_ui_active_view_view_manager_stack.c
+++ b/src/lib/elementary/efl_ui_spotlight_manager_stack.c
@@ -7,19 +7,19 @@
7 7
8 8
9typedef struct { 9typedef struct {
10 Efl_Ui_Active_View_Container * container; 10 Efl_Ui_Spotlight_Container * container;
11 Efl_Gfx_Entity *group; 11 Efl_Gfx_Entity *group;
12 Efl_Canvas_Animation_Player *hide, *show; 12 Efl_Canvas_Animation_Player *hide, *show;
13 int from, to; 13 int from, to;
14 Efl_Gfx_Entity *content; 14 Efl_Gfx_Entity *content;
15 Eina_Size2D page_size; 15 Eina_Size2D page_size;
16 Eina_Bool animation; 16 Eina_Bool animation;
17} Efl_Ui_Active_View_View_Manager_Stack_Data; 17} Efl_Ui_Spotlight_Manager_Stack_Data;
18 18
19#define MY_CLASS EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_STACK_CLASS 19#define MY_CLASS EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS
20 20
21static void 21static void
22_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_View_Manager_Stack_Data *pd) 22_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd)
23{ 23{
24 Eina_Array *array = eina_array_new(2); 24 Eina_Array *array = eina_array_new(2);
25 Eina_Rect group_pos = efl_gfx_entity_geometry_get(pd->group); 25 Eina_Rect group_pos = efl_gfx_entity_geometry_get(pd->group);
@@ -61,11 +61,11 @@ _move_cb(void *data, const Efl_Event *ev EINA_UNUSED)
61static void 61static void
62_running_cb(void *data, const Efl_Event *ev EINA_UNUSED) 62_running_cb(void *data, const Efl_Event *ev EINA_UNUSED)
63{ 63{
64 Efl_Ui_Active_View_View_Manager_Stack_Data *pd = efl_data_scope_safe_get(data, MY_CLASS); 64 Efl_Ui_Spotlight_Manager_Stack_Data *pd = efl_data_scope_safe_get(data, MY_CLASS);
65 65
66 //calculate absolut position, multiply pos with 2.0 because duration is only 0.5) 66 //calculate absolut position, multiply pos with 2.0 because duration is only 0.5)
67 double absolut_position = pd->from + (pd->to - pd->from)*(efl_player_pos_get(pd->show)*2.0); 67 double absolut_position = pd->from + (pd->to - pd->from)*(efl_player_pos_get(pd->show)*2.0);
68 efl_event_callback_call(data, EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_EVENT_POS_UPDATE, &absolut_position); 68 efl_event_callback_call(data, EFL_UI_SPOTLIGHT_MANAGER_EVENT_POS_UPDATE, &absolut_position);
69} 69}
70 70
71static void 71static void
@@ -80,7 +80,7 @@ _anim_started_cb(void *data EINA_UNUSED, const Efl_Event *event)
80static void 80static void
81_hide_anim_ended_cb(void *data, const Efl_Event *event EINA_UNUSED) 81_hide_anim_ended_cb(void *data, const Efl_Event *event EINA_UNUSED)
82{ 82{
83 Efl_Ui_Active_View_View_Manager_Stack_Data *pd = efl_data_scope_safe_get(data, MY_CLASS); 83 Efl_Ui_Spotlight_Manager_Stack_Data *pd = efl_data_scope_safe_get(data, MY_CLASS);
84 Efl_Canvas_Object *content; 84 Efl_Canvas_Object *content;
85 85
86 EINA_SAFETY_ON_NULL_RETURN(pd); 86 EINA_SAFETY_ON_NULL_RETURN(pd);
@@ -91,7 +91,7 @@ _hide_anim_ended_cb(void *data, const Efl_Event *event EINA_UNUSED)
91static void 91static void
92_show_anim_ended_cb(void *data, const Efl_Event *event EINA_UNUSED) 92_show_anim_ended_cb(void *data, const Efl_Event *event EINA_UNUSED)
93{ 93{
94 Efl_Ui_Active_View_View_Manager_Stack_Data *pd = efl_data_scope_safe_get(data, MY_CLASS); 94 Efl_Ui_Spotlight_Manager_Stack_Data *pd = efl_data_scope_safe_get(data, MY_CLASS);
95 Efl_Canvas_Object *content; 95 Efl_Canvas_Object *content;
96 96
97 EINA_SAFETY_ON_NULL_RETURN(pd); 97 EINA_SAFETY_ON_NULL_RETURN(pd);
@@ -112,12 +112,12 @@ EFL_CALLBACKS_ARRAY_DEFINE(_anim_hide_event_cb,
112) 112)
113 113
114EOLIAN static void 114EOLIAN static void
115_efl_ui_active_view_view_manager_stack_efl_ui_active_view_view_manager_bind(Eo *obj, Efl_Ui_Active_View_View_Manager_Stack_Data *pd, Efl_Ui_Active_View_Container *active_view, Efl_Canvas_Group *group) 115_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd, Efl_Ui_Spotlight_Container *spotlight, Efl_Canvas_Group *group)
116{ 116{
117 if (active_view && group) 117 if (spotlight && group)
118 { 118 {
119 Efl_Canvas_Animation_Alpha *show_anim, *hide_anim; 119 Efl_Canvas_Animation_Alpha *show_anim, *hide_anim;
120 pd->container = active_view; 120 pd->container = spotlight;
121 pd->group = group; 121 pd->group = group;
122 122
123 efl_event_callback_add(pd->group, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj); 123 efl_event_callback_add(pd->group, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj);
@@ -144,14 +144,14 @@ _efl_ui_active_view_view_manager_stack_efl_ui_active_view_view_manager_bind(Eo *
144 efl_player_play_set(pd->hide, EINA_FALSE); 144 efl_player_play_set(pd->hide, EINA_FALSE);
145 efl_event_callback_array_add(pd->hide, _anim_hide_event_cb(), obj); 145 efl_event_callback_array_add(pd->hide, _anim_hide_event_cb(), obj);
146 146
147 for (int i = 0; i < efl_content_count(active_view) ; ++i) { 147 for (int i = 0; i < efl_content_count(spotlight) ; ++i) {
148 Efl_Gfx_Entity *elem = efl_pack_content_get(active_view, i); 148 Efl_Gfx_Entity *elem = efl_pack_content_get(spotlight, i);
149 efl_canvas_group_member_add(pd->group, elem); 149 efl_canvas_group_member_add(pd->group, elem);
150 efl_gfx_entity_visible_set(elem, EINA_FALSE); 150 efl_gfx_entity_visible_set(elem, EINA_FALSE);
151 } 151 }
152 if (efl_ui_active_view_active_index_get(active_view) != -1) 152 if (efl_ui_spotlight_active_index_get(spotlight) != -1)
153 { 153 {
154 pd->content = efl_pack_content_get(pd->container, efl_ui_active_view_active_index_get(active_view)); 154 pd->content = efl_pack_content_get(pd->container, efl_ui_spotlight_active_index_get(spotlight));
155 efl_gfx_entity_visible_set(pd->content, EINA_TRUE); 155 efl_gfx_entity_visible_set(pd->content, EINA_TRUE);
156 _geom_sync(obj, pd); 156 _geom_sync(obj, pd);
157 } 157 }
@@ -159,14 +159,14 @@ _efl_ui_active_view_view_manager_stack_efl_ui_active_view_view_manager_bind(Eo *
159} 159}
160 160
161EOLIAN static void 161EOLIAN static void
162_efl_ui_active_view_view_manager_stack_efl_ui_active_view_view_manager_content_add(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_View_Manager_Stack_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) 162_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_content_add(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED)
163{ 163{
164 efl_canvas_group_member_add(pd->group, subobj); 164 efl_canvas_group_member_add(pd->group, subobj);
165 efl_gfx_entity_visible_set(subobj, EINA_FALSE); 165 efl_gfx_entity_visible_set(subobj, EINA_FALSE);
166} 166}
167 167
168EOLIAN static void 168EOLIAN static void
169_efl_ui_active_view_view_manager_stack_efl_ui_active_view_view_manager_content_del(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_View_Manager_Stack_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED) 169_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_content_del(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED)
170{ 170{
171 efl_canvas_group_member_remove(pd->group, subobj); 171 efl_canvas_group_member_remove(pd->group, subobj);
172} 172}
@@ -189,7 +189,7 @@ is_valid(Eo *obj, int index)
189} 189}
190 190
191EOLIAN static void 191EOLIAN static void
192_efl_ui_active_view_view_manager_stack_efl_ui_active_view_view_manager_switch_to(Eo *obj, Efl_Ui_Active_View_View_Manager_Stack_Data *pd, int from, int to) 192_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd, int from, int to)
193{ 193{
194 if (efl_pack_content_get(pd->container, to) == pd->content) 194 if (efl_pack_content_get(pd->container, to) == pd->content)
195 return; 195 return;
@@ -217,21 +217,21 @@ _efl_ui_active_view_view_manager_stack_efl_ui_active_view_view_manager_switch_to
217 217
218 pd->content = efl_pack_content_get(pd->container, to); 218 pd->content = efl_pack_content_get(pd->container, to);
219 efl_gfx_entity_visible_set(pd->content, EINA_TRUE); 219 efl_gfx_entity_visible_set(pd->content, EINA_TRUE);
220 efl_event_callback_call(obj, EFL_UI_ACTIVE_VIEW_VIEW_MANAGER_EVENT_POS_UPDATE, &pos); 220 efl_event_callback_call(obj, EFL_UI_SPOTLIGHT_MANAGER_EVENT_POS_UPDATE, &pos);
221 } 221 }
222 222
223 _geom_sync(obj, pd); 223 _geom_sync(obj, pd);
224} 224}
225 225
226EOLIAN static void 226EOLIAN static void
227_efl_ui_active_view_view_manager_stack_efl_ui_active_view_view_manager_view_size_set(Eo *obj, Efl_Ui_Active_View_View_Manager_Stack_Data *pd, Eina_Size2D size) 227_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_size_set(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd, Eina_Size2D size)
228{ 228{
229 pd->page_size = size; 229 pd->page_size = size;
230 _geom_sync(obj, pd); 230 _geom_sync(obj, pd);
231} 231}
232 232
233EOLIAN static void 233EOLIAN static void
234_efl_ui_active_view_view_manager_stack_efl_object_destructor(Eo *obj, Efl_Ui_Active_View_View_Manager_Stack_Data *pd EINA_UNUSED) 234_efl_ui_spotlight_manager_stack_efl_object_destructor(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd EINA_UNUSED)
235{ 235{
236 efl_event_callback_del(pd->group, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj); 236 efl_event_callback_del(pd->group, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _resize_cb, obj);
237 efl_event_callback_del(pd->group, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, obj); 237 efl_event_callback_del(pd->group, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, _move_cb, obj);
@@ -260,7 +260,7 @@ _reset_player(Efl_Animation_Player *player, Eina_Bool vis)
260} 260}
261 261
262EOLIAN static void 262EOLIAN static void
263_efl_ui_active_view_view_manager_stack_efl_ui_active_view_view_manager_animation_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Active_View_View_Manager_Stack_Data *pd, Eina_Bool animation) 263_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_animation_enabled_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd, Eina_Bool animation)
264{ 264{
265 _reset_player(pd->hide, EINA_FALSE); 265 _reset_player(pd->hide, EINA_FALSE);
266 _reset_player(pd->show, EINA_TRUE); 266 _reset_player(pd->show, EINA_TRUE);
@@ -268,10 +268,10 @@ _efl_ui_active_view_view_manager_stack_efl_ui_active_view_view_manager_animation
268} 268}
269 269
270EOLIAN static Eina_Bool 270EOLIAN static Eina_Bool
271_efl_ui_active_view_view_manager_stack_efl_ui_active_view_view_manager_animation_enabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Active_View_View_Manager_Stack_Data *pd) 271_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_animation_enabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd)
272{ 272{
273 return pd->animation; 273 return pd->animation;
274} 274}
275 275
276 276
277#include "efl_ui_active_view_view_manager_stack.eo.c" 277#include "efl_ui_spotlight_manager_stack.eo.c"
diff --git a/src/lib/elementary/efl_ui_spotlight_manager_stack.eo b/src/lib/elementary/efl_ui_spotlight_manager_stack.eo
new file mode 100644
index 0000000000..999293bda7
--- /dev/null
+++ b/src/lib/elementary/efl_ui_spotlight_manager_stack.eo
@@ -0,0 +1,12 @@
1class @beta Efl.Ui.Spotlight.Manager_Stack extends Efl.Ui.Spotlight.Manager
2{
3 implements {
4 Efl.Ui.Spotlight.Manager.bind;
5 Efl.Ui.Spotlight.Manager.content_add;
6 Efl.Ui.Spotlight.Manager.content_del;
7 Efl.Ui.Spotlight.Manager.switch_to;
8 Efl.Ui.Spotlight.Manager.size {set;}
9 Efl.Ui.Spotlight.Manager.animation_enabled {set; get;}
10 Efl.Object.destructor;
11 }
12}
diff --git a/src/lib/elementary/efl_ui_spotlight_util.c b/src/lib/elementary/efl_ui_spotlight_util.c
new file mode 100644
index 0000000000..308b4f3eaa
--- /dev/null
+++ b/src/lib/elementary/efl_ui_spotlight_util.c
@@ -0,0 +1,21 @@
1#ifdef HAVE_CONFIG_H
2# include "elementary_config.h"
3#endif
4
5#include <Efl_Ui.h>
6#include "elm_priv.h"
7
8typedef struct {
9
10} Efl_Ui_Spotlight_Util_Data;
11
12EOLIAN static Efl_Ui_Spotlight_Container*
13_efl_ui_spotlight_util_stack_gen(Efl_Ui_Widget *parent)
14{
15 Efl_Ui_Spotlight_Manager *manager = efl_add(EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS, parent);
16 return efl_add(EFL_UI_SPOTLIGHT_CONTAINER_CLASS, parent,
17 efl_ui_spotlight_manager_set(efl_added, manager));
18}
19
20
21#include "efl_ui_spotlight_util.eo.c"
diff --git a/src/lib/elementary/efl_ui_active_view_util.eo b/src/lib/elementary/efl_ui_spotlight_util.eo
index 1d7d57b58f..19d446ac61 100644
--- a/src/lib/elementary/efl_ui_active_view_util.eo
+++ b/src/lib/elementary/efl_ui_spotlight_util.eo
@@ -1,11 +1,11 @@
1class @beta Efl.Ui.Active_View.Util { 1class @beta Efl.Ui.Spotlight.Util {
2 methods { 2 methods {
3 stack_gen @class { 3 stack_gen @class {
4 [[Get a preconfigured stack obejct]] 4 [[Get a preconfigured stack obejct]]
5 params { 5 params {
6 parent : Efl.Ui.Widget; 6 parent : Efl.Ui.Widget;
7 } 7 }
8 return : Efl.Ui.Active_View.Container; 8 return : Efl.Ui.Spotlight.Container;
9 } 9 }
10 } 10 }
11} 11}
diff --git a/src/lib/elementary/efl_ui_tab_pager.c b/src/lib/elementary/efl_ui_tab_pager.c
index 98569154c4..99f78b75aa 100644
--- a/src/lib/elementary/efl_ui_tab_pager.c
+++ b/src/lib/elementary/efl_ui_tab_pager.c
@@ -25,8 +25,8 @@ static void
25_tab_select_cb(void *data, const Efl_Event *event) 25_tab_select_cb(void *data, const Efl_Event *event)
26{ 26{
27 int index = efl_ui_tab_bar_current_tab_get(event->object); 27 int index = efl_ui_tab_bar_current_tab_get(event->object);
28 if (efl_ui_active_view_active_index_get(data) != index) 28 if (efl_ui_spotlight_active_index_get(data) != index)
29 efl_ui_active_view_active_index_set(data, index); 29 efl_ui_spotlight_active_index_set(data, index);
30} 30}
31 31
32static void 32static void
@@ -77,9 +77,9 @@ _efl_ui_tab_pager_tab_bar_get(const Eo *obj EINA_UNUSED, Efl_Ui_Tab_Pager_Data *
77} 77}
78 78
79EOLIAN static void 79EOLIAN static void
80_efl_ui_tab_pager_efl_ui_active_view_container_active_index_set(Eo *obj, Efl_Ui_Tab_Pager_Data *sd EINA_UNUSED, int index) 80_efl_ui_tab_pager_efl_ui_spotlight_container_active_index_set(Eo *obj, Efl_Ui_Tab_Pager_Data *sd EINA_UNUSED, int index)
81{ 81{
82 efl_ui_active_view_active_index_set(efl_super(obj, MY_CLASS), index); 82 efl_ui_spotlight_active_index_set(efl_super(obj, MY_CLASS), index);
83 _select(obj, index); 83 _select(obj, index);
84} 84}
85 85
diff --git a/src/lib/elementary/efl_ui_tab_pager.eo b/src/lib/elementary/efl_ui_tab_pager.eo
index c566598d45..79eaede7b5 100644
--- a/src/lib/elementary/efl_ui_tab_pager.eo
+++ b/src/lib/elementary/efl_ui_tab_pager.eo
@@ -1,4 +1,4 @@
1class @beta Efl.Ui.Tab_Pager extends Efl.Ui.Active_View.Container 1class @beta Efl.Ui.Tab_Pager extends Efl.Ui.Spotlight.Container
2{ 2{
3 [[Tab Pager class]] 3 [[Tab Pager class]]
4 methods { 4 methods {
@@ -23,6 +23,6 @@ class @beta Efl.Ui.Tab_Pager extends Efl.Ui.Active_View.Container
23 Efl.Pa