summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2020-01-23 12:55:12 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2020-01-23 12:55:12 +0900
commit3e21d343492686d38ae8cb488a929e3af07d8d4e (patch)
tree976f41e227fe4923c62bfae643b72de97e11dae4 /src/lib
parent68d7f584cb78402dbe884d3a7b902c4735d96f8a (diff)
efl_ui_spotlight: rename Manager_XXX and Indicator_XXX
Summary: In spotlight classes, "Manager" and "Indicator" are used as prefix in the class names. e.g. Efl.Ui.Spotlight.Manager_Plain, Efl.Ui.Spotlight.Indicator_Icon However, those classes are basically manager and indicator classes with different features. Therefore, "Manager" and "Indicator" should be used as postfix in the class names. e.g. Efl.Ui.Spotlight.Plain_Manager, Efl.Ui.Spotlight.Icon_Indicator However, for the easier usage of C APIs, c_prefix of those classes are remained to be "efl_ui_spotlight_manager_xxx" and "efl_ui_spotlight_indicator_xxx". Reviewers: segfaultxavi, bu5hm4n, zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11142
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elementary/Efl_Ui.h6
-rw-r--r--src/lib/elementary/efl_ui_pager.c2
-rw-r--r--src/lib/elementary/efl_ui_spotlight_container.c8
-rw-r--r--src/lib/elementary/efl_ui_spotlight_icon_indicator.c (renamed from src/lib/elementary/efl_ui_spotlight_indicator_icon.c)20
-rw-r--r--src/lib/elementary/efl_ui_spotlight_icon_indicator.eo (renamed from src/lib/elementary/efl_ui_spotlight_indicator_icon.eo)3
-rw-r--r--src/lib/elementary/efl_ui_spotlight_plain_manager.c (renamed from src/lib/elementary/efl_ui_spotlight_manager_plain.c)32
-rw-r--r--src/lib/elementary/efl_ui_spotlight_plain_manager.eo (renamed from src/lib/elementary/efl_ui_spotlight_manager_plain.eo)3
-rw-r--r--src/lib/elementary/efl_ui_spotlight_scroll_manager.c (renamed from src/lib/elementary/efl_ui_spotlight_manager_scroll.c)38
-rw-r--r--src/lib/elementary/efl_ui_spotlight_scroll_manager.eo (renamed from src/lib/elementary/efl_ui_spotlight_manager_scroll.eo)3
-rw-r--r--src/lib/elementary/efl_ui_spotlight_stack_manager.c (renamed from src/lib/elementary/efl_ui_spotlight_manager_stack.c)28
-rw-r--r--src/lib/elementary/efl_ui_spotlight_stack_manager.eo (renamed from src/lib/elementary/efl_ui_spotlight_manager_stack.eo)3
-rw-r--r--src/lib/elementary/efl_ui_spotlight_util.c2
-rw-r--r--src/lib/elementary/efl_ui_stack.c2
-rw-r--r--src/lib/elementary/meson.build16
14 files changed, 85 insertions, 81 deletions
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index 4ec831f2a2..64497913db 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -266,9 +266,9 @@ typedef Eo Efl_Ui_Spotlight_Indicator;
266# include <efl_ui_spotlight_container.eo.h> 266# include <efl_ui_spotlight_container.eo.h>
267# include <efl_ui_spotlight_manager.eo.h> 267# include <efl_ui_spotlight_manager.eo.h>
268# include <efl_ui_spotlight_indicator.eo.h> 268# include <efl_ui_spotlight_indicator.eo.h>
269# include <efl_ui_spotlight_indicator_icon.eo.h> 269# include <efl_ui_spotlight_icon_indicator.eo.h>
270# include <efl_ui_spotlight_manager_scroll.eo.h> 270# include <efl_ui_spotlight_scroll_manager.eo.h>
271# include <efl_ui_spotlight_manager_stack.eo.h> 271# include <efl_ui_spotlight_stack_manager.eo.h>
272# include <efl_ui_spotlight_util.eo.h> 272# include <efl_ui_spotlight_util.eo.h>
273# include <efl_ui_stack.eo.h> 273# include <efl_ui_stack.eo.h>
274# include <efl_ui_pager.eo.h> 274# include <efl_ui_pager.eo.h>
diff --git a/src/lib/elementary/efl_ui_pager.c b/src/lib/elementary/efl_ui_pager.c
index 8ac5a429cc..33ab9bf9bd 100644
--- a/src/lib/elementary/efl_ui_pager.c
+++ b/src/lib/elementary/efl_ui_pager.c
@@ -18,7 +18,7 @@ _efl_ui_pager_efl_object_constructor(Eo *obj, Efl_Ui_Pager_Data *sd EINA_UNUSED)
18 18
19 obj = efl_constructor(efl_super(obj, MY_CLASS)); 19 obj = efl_constructor(efl_super(obj, MY_CLASS));
20 20
21 scroller = efl_new(EFL_UI_SPOTLIGHT_MANAGER_SCROLL_CLASS); 21 scroller = efl_new(EFL_UI_SPOTLIGHT_SCROLL_MANAGER_CLASS);
22 efl_ui_spotlight_manager_set(obj, scroller); 22 efl_ui_spotlight_manager_set(obj, scroller);
23 23
24 return obj; 24 return obj;
diff --git a/src/lib/elementary/efl_ui_spotlight_container.c b/src/lib/elementary/efl_ui_spotlight_container.c
index a5f3c9e390..1bc3c25f8f 100644
--- a/src/lib/elementary/efl_ui_spotlight_container.c
+++ b/src/lib/elementary/efl_ui_spotlight_container.c
@@ -4,7 +4,7 @@
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_spotlight_manager_plain.eo.h" 7#include "efl_ui_spotlight_plain_manager.eo.h"
8 8
9typedef struct _Efl_Ui_Spotlight_Container_Data 9typedef struct _Efl_Ui_Spotlight_Container_Data
10{ 10{
@@ -236,7 +236,7 @@ _efl_ui_spotlight_container_efl_object_finalize(Eo *obj, Efl_Ui_Spotlight_Contai
236 //set a view manager in case nothing is here 236 //set a view manager in case nothing is here
237 if (!manager) 237 if (!manager)
238 { 238 {
239 efl_ui_spotlight_manager_set(obj, efl_new(EFL_UI_SPOTLIGHT_MANAGER_PLAIN_CLASS)); 239 efl_ui_spotlight_manager_set(obj, efl_new(EFL_UI_SPOTLIGHT_PLAIN_MANAGER_CLASS));
240 } 240 }
241 else 241 else
242 { 242 {
@@ -648,7 +648,7 @@ EOLIAN static void
648_efl_ui_spotlight_container_spotlight_manager_set(Eo *obj, Efl_Ui_Spotlight_Container_Data *pd, Efl_Ui_Spotlight_Manager *transition) 648_efl_ui_spotlight_container_spotlight_manager_set(Eo *obj, Efl_Ui_Spotlight_Container_Data *pd, Efl_Ui_Spotlight_Manager *transition)
649{ 649{
650 if (!transition) 650 if (!transition)
651 pd->transition = efl_add(EFL_UI_SPOTLIGHT_MANAGER_PLAIN_CLASS, obj); 651 pd->transition = efl_add(EFL_UI_SPOTLIGHT_PLAIN_MANAGER_CLASS, obj);
652 else 652 else
653 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(transition, EFL_UI_SPOTLIGHT_MANAGER_CLASS)); 653 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(transition, EFL_UI_SPOTLIGHT_MANAGER_CLASS));
654 654
@@ -679,7 +679,7 @@ _efl_ui_spotlight_container_spotlight_manager_set(Eo *obj, Efl_Ui_Spotlight_Cont
679EOLIAN static Efl_Ui_Spotlight_Manager* 679EOLIAN static Efl_Ui_Spotlight_Manager*
680_efl_ui_spotlight_container_spotlight_manager_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Container_Data *pd) 680_efl_ui_spotlight_container_spotlight_manager_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Container_Data *pd)
681{ 681{
682 if (efl_isa(pd->transition, EFL_UI_SPOTLIGHT_MANAGER_PLAIN_CLASS)) 682 if (efl_isa(pd->transition, EFL_UI_SPOTLIGHT_PLAIN_MANAGER_CLASS))
683 return NULL; 683 return NULL;
684 else 684 else
685 return pd->transition; 685 return pd->transition;
diff --git a/src/lib/elementary/efl_ui_spotlight_indicator_icon.c b/src/lib/elementary/efl_ui_spotlight_icon_indicator.c
index 4ac177580d..731a9a9429 100644
--- a/src/lib/elementary/efl_ui_spotlight_indicator_icon.c
+++ b/src/lib/elementary/efl_ui_spotlight_icon_indicator.c
@@ -13,7 +13,7 @@ typedef struct {
13 Efl_Canvas_Layout *layout; 13 Efl_Canvas_Layout *layout;
14 double last_position; 14 double last_position;
15 Eina_Size2D min, max; 15 Eina_Size2D min, max;
16} Efl_Ui_Spotlight_Indicator_Icon_Data; 16} Efl_Ui_Spotlight_Icon_Indicator_Data;
17 17
18static void 18static void
19_flush_state(Eo *item, double val) 19_flush_state(Eo *item, double val)
@@ -24,7 +24,7 @@ _flush_state(Eo *item, double val)
24} 24}
25 25
26static void 26static void
27_add_item(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Indicator_Icon_Data *pd) 27_add_item(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Icon_Indicator_Data *pd)
28{ 28{
29 Efl_Canvas_Layout *item; 29 Efl_Canvas_Layout *item;
30 30
@@ -40,7 +40,7 @@ _add_item(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Indicator_Icon_Data *pd)
40} 40}
41 41
42static void 42static void
43_flush_position(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Indicator_Icon_Data *pd) 43_flush_position(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Icon_Indicator_Data *pd)
44{ 44{
45 int next = -1, closer; 45 int next = -1, closer;
46 double closer_val; 46 double closer_val;
@@ -91,7 +91,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(spotlight_resized,
91) 91)
92 92
93EOLIAN static void 93EOLIAN static void
94_efl_ui_spotlight_indicator_icon_efl_ui_spotlight_indicator_bind(Eo *obj, Efl_Ui_Spotlight_Indicator_Icon_Data *pd, Efl_Ui_Spotlight_Container *spotlight) 94_efl_ui_spotlight_icon_indicator_efl_ui_spotlight_indicator_bind(Eo *obj, Efl_Ui_Spotlight_Icon_Indicator_Data *pd, Efl_Ui_Spotlight_Container *spotlight)
95{ 95{
96 if (spotlight) 96 if (spotlight)
97 { 97 {
@@ -122,7 +122,7 @@ _efl_ui_spotlight_indicator_icon_efl_ui_spotlight_indicator_bind(Eo *obj, Efl_Ui
122} 122}
123 123
124EOLIAN static void 124EOLIAN static void
125_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) 125_efl_ui_spotlight_icon_indicator_efl_ui_spotlight_indicator_content_add(Eo *obj, Efl_Ui_Spotlight_Icon_Indicator_Data *pd, Efl_Gfx_Entity *subobj EINA_UNUSED, int index EINA_UNUSED)
126{ 126{
127 _add_item(obj, pd); 127 _add_item(obj, pd);
128 _flush_position(obj, pd); 128 _flush_position(obj, pd);
@@ -130,29 +130,29 @@ _efl_ui_spotlight_indicator_icon_efl_ui_spotlight_indicator_content_add(Eo *obj,
130} 130}
131 131
132EOLIAN static void 132EOLIAN static void
133_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) 133_efl_ui_spotlight_icon_indicator_efl_ui_spotlight_indicator_content_del(Eo *obj, Efl_Ui_Spotlight_Icon_Indicator_Data *pd, Efl_Gfx_Entity *subobj EINA_UNUSED, int index EINA_UNUSED)
134{ 134{
135 efl_del(efl_pack_content_get(pd->indicator, 0)); 135 efl_del(efl_pack_content_get(pd->indicator, 0));
136 _flush_position(obj, pd); 136 _flush_position(obj, pd);
137} 137}
138 138
139EOLIAN static void 139EOLIAN static void
140_efl_ui_spotlight_indicator_icon_efl_ui_spotlight_indicator_position_update(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Indicator_Icon_Data *pd, double position) 140_efl_ui_spotlight_icon_indicator_efl_ui_spotlight_indicator_position_update(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Icon_Indicator_Data *pd, double position)
141{ 141{
142 pd->last_position = position; 142 pd->last_position = position;
143 _flush_position(obj, pd); 143 _flush_position(obj, pd);
144} 144}
145 145
146EOLIAN static void 146EOLIAN static void
147_efl_ui_spotlight_indicator_icon_efl_object_destructor(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Indicator_Icon_Data *pd) 147_efl_ui_spotlight_icon_indicator_efl_object_destructor(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Icon_Indicator_Data *pd)
148{ 148{
149 if (pd->layout) 149 if (pd->layout)
150 efl_del(pd->layout); 150 efl_del(pd->layout);
151 if (pd->indicator) 151 if (pd->indicator)
152 efl_del(pd->indicator); 152 efl_del(pd->indicator);
153 153
154 efl_destructor(efl_super(obj, EFL_UI_SPOTLIGHT_INDICATOR_ICON_CLASS)); 154 efl_destructor(efl_super(obj, EFL_UI_SPOTLIGHT_ICON_INDICATOR_CLASS));
155} 155}
156 156
157 157
158#include "efl_ui_spotlight_indicator_icon.eo.c" 158#include "efl_ui_spotlight_icon_indicator.eo.c"
diff --git a/src/lib/elementary/efl_ui_spotlight_indicator_icon.eo b/src/lib/elementary/efl_ui_spotlight_icon_indicator.eo
index de1d689d74..63ef0554fd 100644
--- a/src/lib/elementary/efl_ui_spotlight_indicator_icon.eo
+++ b/src/lib/elementary/efl_ui_spotlight_icon_indicator.eo
@@ -1,4 +1,5 @@
1class @beta Efl.Ui.Spotlight.Indicator_Icon extends Efl.Ui.Spotlight.Indicator { 1class @beta Efl.Ui.Spotlight.Icon_Indicator extends Efl.Ui.Spotlight.Indicator {
2 c_prefix: efl_ui_spotlight_indicator_icon;
2 implements { 3 implements {
3 Efl.Ui.Spotlight.Indicator.bind; 4 Efl.Ui.Spotlight.Indicator.bind;
4 Efl.Ui.Spotlight.Indicator.content_del; 5 Efl.Ui.Spotlight.Indicator.content_del;
diff --git a/src/lib/elementary/efl_ui_spotlight_manager_plain.c b/src/lib/elementary/efl_ui_spotlight_plain_manager.c
index 81c954e62f..d120ef8f11 100644
--- a/src/lib/elementary/efl_ui_spotlight_manager_plain.c
+++ b/src/lib/elementary/efl_ui_spotlight_plain_manager.c
@@ -4,7 +4,7 @@
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_spotlight_manager_plain.eo.h" 7#include "efl_ui_spotlight_plain_manager.eo.h"
8 8
9typedef struct { 9typedef struct {
10 Efl_Ui_Spotlight_Container * container; 10 Efl_Ui_Spotlight_Container * container;
@@ -13,12 +13,12 @@ typedef struct {
13 Efl_Gfx_Entity *clipper; 13 Efl_Gfx_Entity *clipper;
14 Eina_Bool animation; 14 Eina_Bool animation;
15 double last_pos; 15 double last_pos;
16} Efl_Ui_Spotlight_Manager_Plain_Data; 16} Efl_Ui_Spotlight_Plain_Manager_Data;
17 17
18#define MY_CLASS EFL_UI_SPOTLIGHT_MANAGER_PLAIN_CLASS 18#define MY_CLASS EFL_UI_SPOTLIGHT_PLAIN_MANAGER_CLASS
19 19
20static void 20static void
21_emit_position(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd) 21_emit_position(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Plain_Manager_Data *pd)
22{ 22{
23 double absolut_position = efl_pack_index_get(pd->container, pd->current_content); 23 double absolut_position = efl_pack_index_get(pd->container, pd->current_content);
24 if (pd->last_pos != absolut_position) 24 if (pd->last_pos != absolut_position)
@@ -28,7 +28,7 @@ _emit_position(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd)
28} 28}
29 29
30static void 30static void
31_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd) 31_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Plain_Manager_Data *pd)
32{ 32{
33 Efl_Gfx_Entity *entity = pd->current_content; 33 Efl_Gfx_Entity *entity = pd->current_content;
34 Eina_Rect group_pos = efl_gfx_entity_geometry_get(pd->container); 34 Eina_Rect group_pos = efl_gfx_entity_geometry_get(pd->container);
@@ -42,7 +42,7 @@ _geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd)
42} 42}
43 43
44EOLIAN static void 44EOLIAN static void
45_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd, Efl_Ui_Spotlight_Container *spotlight) 45_efl_ui_spotlight_plain_manager_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd, Efl_Ui_Spotlight_Container *spotlight)
46{ 46{
47 if (spotlight) 47 if (spotlight)
48 { 48 {
@@ -74,7 +74,7 @@ _efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Sp
74} 74}
75 75
76static void 76static void
77_content_changed(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd) 77_content_changed(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd)
78{ 78{
79 if (efl_ui_spotlight_active_element_get(pd->container) != pd->current_content) 79 if (efl_ui_spotlight_active_element_get(pd->container) != pd->current_content)
80 { 80 {
@@ -88,7 +88,7 @@ _content_changed(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd)
88} 88}
89 89
90EOLIAN static void 90EOLIAN static void
91_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) 91_efl_ui_spotlight_plain_manager_efl_ui_spotlight_manager_content_add(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED)
92{ 92{
93 efl_key_data_set(subobj, "_elm_leaveme", pd->container); 93 efl_key_data_set(subobj, "_elm_leaveme", pd->container);
94 efl_canvas_object_clipper_set(subobj, pd->clipper); 94 efl_canvas_object_clipper_set(subobj, pd->clipper);
@@ -98,7 +98,7 @@ _efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_content_add(Eo *obj, Ef
98} 98}
99 99
100EOLIAN static void 100EOLIAN static void
101_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) 101_efl_ui_spotlight_plain_manager_efl_ui_spotlight_manager_content_del(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED)
102{ 102{
103 efl_key_data_set(subobj, "_elm_leaveme", NULL); 103 efl_key_data_set(subobj, "_elm_leaveme", NULL);
104 efl_canvas_object_clipper_set(subobj, NULL); 104 efl_canvas_object_clipper_set(subobj, NULL);
@@ -108,7 +108,7 @@ _efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_content_del(Eo *obj, Ef
108 _content_changed(obj, pd); 108 _content_changed(obj, pd);
109} 109}
110EOLIAN static void 110EOLIAN static void
111_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) 111_efl_ui_spotlight_plain_manager_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd, int from EINA_UNUSED, int to)
112{ 112{
113 Efl_Gfx_Entity *to_obj, *from_obj; 113 Efl_Gfx_Entity *to_obj, *from_obj;
114 to_obj = efl_pack_content_get(pd->container, to); 114 to_obj = efl_pack_content_get(pd->container, to);
@@ -130,14 +130,14 @@ _efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_
130} 130}
131 131
132EOLIAN static void 132EOLIAN static void
133_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_size_set(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd, Eina_Size2D size) 133_efl_ui_spotlight_plain_manager_efl_ui_spotlight_manager_size_set(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd, Eina_Size2D size)
134{ 134{
135 pd->page_size = size; 135 pd->page_size = size;
136 _geom_sync(obj, pd); 136 _geom_sync(obj, pd);
137} 137}
138 138
139EOLIAN static void 139EOLIAN static void
140_efl_ui_spotlight_manager_plain_efl_object_destructor(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd EINA_UNUSED) 140_efl_ui_spotlight_plain_manager_efl_object_destructor(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd EINA_UNUSED)
141{ 141{
142 efl_destructor(efl_super(obj, MY_CLASS)); 142 efl_destructor(efl_super(obj, MY_CLASS));
143 143
@@ -149,19 +149,19 @@ _efl_ui_spotlight_manager_plain_efl_object_destructor(Eo *obj, Efl_Ui_Spotlight_
149} 149}
150 150
151EOLIAN static void 151EOLIAN static void
152_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_animated_transition_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd, Eina_Bool animation) 152_efl_ui_spotlight_plain_manager_efl_ui_spotlight_manager_animated_transition_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Plain_Manager_Data *pd, Eina_Bool animation)
153{ 153{
154 pd->animation = animation; 154 pd->animation = animation;
155} 155}
156 156
157EOLIAN static Eina_Bool 157EOLIAN static Eina_Bool
158_efl_ui_spotlight_manager_plain_efl_ui_spotlight_manager_animated_transition_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Plain_Data *pd) 158_efl_ui_spotlight_plain_manager_efl_ui_spotlight_manager_animated_transition_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Plain_Manager_Data *pd)
159{ 159{
160 return pd->animation; 160 return pd->animation;
161} 161}
162 162
163EOLIAN static void 163EOLIAN static void
164_efl_ui_spotlight_manager_plain_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Manager_Plain_Data *pd) 164_efl_ui_spotlight_plain_manager_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Plain_Manager_Data *pd)
165{ 165{
166 efl_del(pd->clipper); 166 efl_del(pd->clipper);
167 167
@@ -173,4 +173,4 @@ _efl_ui_spotlight_manager_plain_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_
173 efl_invalidate(efl_super(obj, MY_CLASS)); 173 efl_invalidate(efl_super(obj, MY_CLASS));
174} 174}
175 175
176#include "efl_ui_spotlight_manager_plain.eo.c" 176#include "efl_ui_spotlight_plain_manager.eo.c"
diff --git a/src/lib/elementary/efl_ui_spotlight_manager_plain.eo b/src/lib/elementary/efl_ui_spotlight_plain_manager.eo
index 23bf0e443e..95464305ec 100644
--- a/src/lib/elementary/efl_ui_spotlight_manager_plain.eo
+++ b/src/lib/elementary/efl_ui_spotlight_plain_manager.eo
@@ -1,5 +1,6 @@
1class @beta Efl.Ui.Spotlight.Manager_Plain extends Efl.Ui.Spotlight.Manager 1class @beta Efl.Ui.Spotlight.Plain_Manager extends Efl.Ui.Spotlight.Manager
2{ 2{
3 c_prefix: efl_ui_spotlight_manager_plain;
3 implements { 4 implements {
4 Efl.Ui.Spotlight.Manager.bind; 5 Efl.Ui.Spotlight.Manager.bind;
5 Efl.Ui.Spotlight.Manager.content_add; 6 Efl.Ui.Spotlight.Manager.content_add;
diff --git a/src/lib/elementary/efl_ui_spotlight_manager_scroll.c b/src/lib/elementary/efl_ui_spotlight_scroll_manager.c
index 267b64471b..bdb6840c06 100644
--- a/src/lib/elementary/efl_ui_spotlight_manager_scroll.c
+++ b/src/lib/elementary/efl_ui_spotlight_scroll_manager.c
@@ -24,9 +24,9 @@ typedef struct {
24 } mouse_move; 24 } mouse_move;
25 Eina_Bool animation; 25 Eina_Bool animation;
26 Eina_Bool scroll_block; 26 Eina_Bool scroll_block;
27} Efl_Ui_Spotlight_Manager_Scroll_Data; 27} Efl_Ui_Spotlight_Scroll_Manager_Data;
28 28
29#define MY_CLASS EFL_UI_SPOTLIGHT_MANAGER_SCROLL_CLASS 29#define MY_CLASS EFL_UI_SPOTLIGHT_SCROLL_MANAGER_CLASS
30 30
31static void _page_set_animation(void *data, const Efl_Event *event); 31static void _page_set_animation(void *data, const Efl_Event *event);
32 32
@@ -37,7 +37,7 @@ _propagate_progress(Eo *obj, double pos)
37} 37}
38 38
39static void 39static void
40_apply_box_properties(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd) 40_apply_box_properties(Eo *obj, Efl_Ui_Spotlight_Scroll_Manager_Data *pd)
41{ 41{
42 Eina_Rect geometry = EINA_RECT_EMPTY(); 42 Eina_Rect geometry = EINA_RECT_EMPTY();
43 Eina_Rect group_pos = efl_gfx_entity_geometry_get(pd->container); 43 Eina_Rect group_pos = efl_gfx_entity_geometry_get(pd->container);
@@ -84,7 +84,7 @@ _mouse_down_cb(void *data,
84{ 84{
85 Efl_Input_Pointer *ev = event->info; 85 Efl_Input_Pointer *ev = event->info;
86 Eo *obj = data; 86 Eo *obj = data;
87 Efl_Ui_Spotlight_Manager_Scroll_Data *pd = efl_data_scope_get(obj, MY_CLASS); 87 Efl_Ui_Spotlight_Scroll_Manager_Data *pd = efl_data_scope_get(obj, MY_CLASS);
88 88
89 if (efl_input_pointer_button_get(ev) != 1) return; 89 if (efl_input_pointer_button_get(ev) != 1) return;
90 if (efl_input_event_flags_get(ev) & EFL_INPUT_FLAGS_PROCESSED) return; 90 if (efl_input_event_flags_get(ev) & EFL_INPUT_FLAGS_PROCESSED) return;
@@ -110,7 +110,7 @@ _mouse_move_cb(void *data,
110{ 110{
111 Efl_Input_Pointer *ev = event->info; 111 Efl_Input_Pointer *ev = event->info;
112 Eo *obj = data; 112 Eo *obj = data;
113 Efl_Ui_Spotlight_Manager_Scroll_Data *pd = efl_data_scope_get(obj, MY_CLASS); 113 Efl_Ui_Spotlight_Scroll_Manager_Data *pd = efl_data_scope_get(obj, MY_CLASS);
114 Eina_Position2D pos; 114 Eina_Position2D pos;
115 int pos_y_diff; 115 int pos_y_diff;
116 116
@@ -139,7 +139,7 @@ _mouse_up_cb(void *data,
139{ 139{
140 Efl_Input_Pointer *ev = event->info; 140 Efl_Input_Pointer *ev = event->info;
141 Eo *obj = data; 141 Eo *obj = data;
142 Efl_Ui_Spotlight_Manager_Scroll_Data *pd = efl_data_scope_get(obj, MY_CLASS); 142 Efl_Ui_Spotlight_Scroll_Manager_Data *pd = efl_data_scope_get(obj, MY_CLASS);
143 143
144 if (efl_input_event_flags_get(ev) & EFL_INPUT_FLAGS_PROCESSED) return; 144 if (efl_input_event_flags_get(ev) & EFL_INPUT_FLAGS_PROCESSED) return;
145 if (!pd->mouse_move.active) return; 145 if (!pd->mouse_move.active) return;
@@ -159,7 +159,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(mouse_listeners,
159); 159);
160 160
161EOLIAN static void 161EOLIAN static void
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) 162_efl_ui_spotlight_scroll_manager_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, Efl_Ui_Spotlight_Container *spotlight)
163{ 163{
164 if (spotlight) 164 if (spotlight)
165 { 165 {
@@ -196,7 +196,7 @@ _efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_S
196} 196}
197 197
198EOLIAN static void 198EOLIAN static void
199_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) 199_efl_ui_spotlight_scroll_manager_efl_ui_spotlight_manager_content_add(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED)
200{ 200{
201 efl_key_data_set(subobj, "_elm_leaveme", pd->container); 201 efl_key_data_set(subobj, "_elm_leaveme", pd->container);
202 efl_gfx_entity_visible_set(subobj, EINA_TRUE); 202 efl_gfx_entity_visible_set(subobj, EINA_TRUE);
@@ -209,7 +209,7 @@ _efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_content_add(Eo *obj EI
209 209
210 210
211EOLIAN static void 211EOLIAN static void
212_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) 212_efl_ui_spotlight_scroll_manager_efl_ui_spotlight_manager_content_del(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED)
213{ 213{
214 efl_key_data_set(subobj, "_elm_leaveme", NULL); 214 efl_key_data_set(subobj, "_elm_leaveme", NULL);
215 efl_canvas_object_clipper_set(subobj, NULL); 215 efl_canvas_object_clipper_set(subobj, NULL);
@@ -222,7 +222,7 @@ _efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_content_del(Eo *obj EI
222static void 222static void
223_page_set_animation(void *data, const Efl_Event *event EINA_UNUSED) 223_page_set_animation(void *data, const Efl_Event *event EINA_UNUSED)
224{ 224{
225 Efl_Ui_Spotlight_Manager_Scroll_Data *pd = efl_data_scope_get(data, MY_CLASS); 225 Efl_Ui_Spotlight_Scroll_Manager_Data *pd = efl_data_scope_get(data, MY_CLASS);
226 double p = (ecore_loop_time_get() - pd->transition.start_time) / pd->transition.max_time; 226 double p = (ecore_loop_time_get() - pd->transition.start_time) / pd->transition.max_time;
227 227
228 if (p >= 1.0) p = 1.0; 228 if (p >= 1.0) p = 1.0;
@@ -241,7 +241,7 @@ _page_set_animation(void *data, const Efl_Event *event EINA_UNUSED)
241} 241}
242 242
243static void 243static void
244_animation_request_switch(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, int from, int to) 244_animation_request_switch(Eo *obj, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, int from, int to)
245{ 245{
246 //if there is already a transition ongoing, which is no mouse transition, but goes to the same position, then do nothing 246 //if there is already a transition ongoing, which is no mouse transition, but goes to the same position, then do nothing
247 if (pd->transition.active && !pd->mouse_move.active && pd->transition.to == to) 247 if (pd->transition.active && !pd->mouse_move.active && pd->transition.to == to)
@@ -276,7 +276,7 @@ _animation_request_switch(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, int
276} 276}
277 277
278EOLIAN static void 278EOLIAN static void
279_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, int from, int to) 279_efl_ui_spotlight_scroll_manager_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, int from, int to)
280{ 280{
281 if (pd->animation) 281 if (pd->animation)
282 { 282 {
@@ -292,7 +292,7 @@ _efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl
292} 292}
293 293
294EOLIAN static void 294EOLIAN static void
295_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) 295_efl_ui_spotlight_scroll_manager_efl_ui_spotlight_manager_size_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, Eina_Size2D size)
296{ 296{
297 pd->page_size = size; 297 pd->page_size = size;
298 if (!pd->transition.active) 298 if (!pd->transition.active)
@@ -300,7 +300,7 @@ _efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_size_set(Eo *obj EINA_
300} 300}
301 301
302EOLIAN static void 302EOLIAN static void
303_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_animated_transition_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, Eina_Bool animation) 303_efl_ui_spotlight_scroll_manager_efl_ui_spotlight_manager_animated_transition_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, Eina_Bool animation)
304{ 304{
305 pd->animation = animation; 305 pd->animation = animation;
306 if (pd->transition.active && !animation) 306 if (pd->transition.active && !animation)
@@ -312,14 +312,14 @@ _efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_animated_transition_se
312} 312}
313 313
314EOLIAN static Eina_Bool 314EOLIAN static Eina_Bool
315_efl_ui_spotlight_manager_scroll_efl_ui_spotlight_manager_animated_transition_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd) 315_efl_ui_spotlight_scroll_manager_efl_ui_spotlight_manager_animated_transition_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Scroll_Manager_Data *pd)
316{ 316{
317 return pd->animation; 317 return pd->animation;
318} 318}
319 319
320 320
321EOLIAN static void 321EOLIAN static void
322_efl_ui_spotlight_manager_scroll_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Manager_Scroll_Data *pd EINA_UNUSED) 322_efl_ui_spotlight_scroll_manager_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Scroll_Manager_Data *pd EINA_UNUSED)
323{ 323{
324 efl_del(pd->event); 324 efl_del(pd->event);
325 efl_del(pd->backclip); 325 efl_del(pd->backclip);
@@ -334,7 +334,7 @@ _efl_ui_spotlight_manager_scroll_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight
334} 334}
335 335
336EOLIAN static void 336EOLIAN static void
337_efl_ui_spotlight_manager_scroll_scroll_block_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd, Eina_Bool scroll_block) 337_efl_ui_spotlight_scroll_manager_scroll_block_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Scroll_Manager_Data *pd, Eina_Bool scroll_block)
338{ 338{
339 if (pd->scroll_block == scroll_block) return; 339 if (pd->scroll_block == scroll_block) return;
340 340
@@ -349,9 +349,9 @@ _efl_ui_spotlight_manager_scroll_scroll_block_set(Eo *obj EINA_UNUSED, Efl_Ui_Sp
349} 349}
350 350
351EOLIAN static Eina_Bool 351EOLIAN static Eina_Bool
352_efl_ui_spotlight_manager_scroll_scroll_block_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Scroll_Data *pd) 352_efl_ui_spotlight_scroll_manager_scroll_block_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Scroll_Manager_Data *pd)
353{ 353{
354 return pd->scroll_block; 354 return pd->scroll_block;
355} 355}
356 356
357#include "efl_ui_spotlight_manager_scroll.eo.c" 357#include "efl_ui_spotlight_scroll_manager.eo.c"
diff --git a/src/lib/elementary/efl_ui_spotlight_manager_scroll.eo b/src/lib/elementary/efl_ui_spotlight_scroll_manager.eo
index c9a8e7ad34..b7101035cd 100644
--- a/src/lib/elementary/efl_ui_spotlight_manager_scroll.eo
+++ b/src/lib/elementary/efl_ui_spotlight_scroll_manager.eo
@@ -1,5 +1,6 @@
1class @beta Efl.Ui.Spotlight.Manager_Scroll extends Efl.Ui.Spotlight.Manager 1class @beta Efl.Ui.Spotlight.Scroll_Manager extends Efl.Ui.Spotlight.Manager
2{ 2{
3 c_prefix: efl_ui_spotlight_manager_scroll;
3 methods { 4 methods {
4 @property scroll_block { 5 @property scroll_block {
5 [[User scrolling forbidden. 6 [[User scrolling forbidden.
diff --git a/src/lib/elementary/efl_ui_spotlight_manager_stack.c b/src/lib/elementary/efl_ui_spotlight_stack_manager.c
index dccef97cdc..253a7259f4 100644
--- a/src/lib/elementary/efl_ui_spotlight_manager_stack.c
+++ b/src/lib/elementary/efl_ui_spotlight_stack_manager.c
@@ -14,12 +14,12 @@ typedef struct {
14 int ids[2]; //only used when in animation 14 int ids[2]; //only used when in animation
15 Eina_Size2D page_size; 15 Eina_Size2D page_size;
16 Eina_Bool animation; 16 Eina_Bool animation;
17} Efl_Ui_Spotlight_Manager_Stack_Data; 17} Efl_Ui_Spotlight_Stack_Manager_Data;
18 18
19#define MY_CLASS EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS 19#define MY_CLASS EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS
20 20
21static void 21static void
22_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd) 22_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Stack_Manager_Data *pd)
23{ 23{
24 Eina_Rect group_pos = efl_gfx_entity_geometry_get(pd->container); 24 Eina_Rect group_pos = efl_gfx_entity_geometry_get(pd->container);
25 Eina_Rect goal = EINA_RECT_EMPTY(); 25 Eina_Rect goal = EINA_RECT_EMPTY();
@@ -37,7 +37,7 @@ _geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd)
37static void 37static void
38_running_cb(void *data, const Efl_Event *ev EINA_UNUSED) 38_running_cb(void *data, const Efl_Event *ev EINA_UNUSED)
39{ 39{
40 Efl_Ui_Spotlight_Manager_Stack_Data *pd = efl_data_scope_safe_get(data, MY_CLASS); 40 Efl_Ui_Spotlight_Stack_Manager_Data *pd = efl_data_scope_safe_get(data, MY_CLASS);
41 double absolut_position; 41 double absolut_position;
42 42
43 EINA_SAFETY_ON_NULL_RETURN(pd); 43 EINA_SAFETY_ON_NULL_RETURN(pd);
@@ -58,7 +58,7 @@ _hide_object_cb(void *data, const Efl_Event *ev)
58} 58}
59 59
60EOLIAN static void 60EOLIAN static void
61_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd, Efl_Ui_Spotlight_Container *spotlight) 61_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, Efl_Ui_Spotlight_Container *spotlight)
62{ 62{
63 if (spotlight) 63 if (spotlight)
64 { 64 {
@@ -90,7 +90,7 @@ _efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Sp
90} 90}
91 91
92static void 92static void
93_update_ids(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd, int avoid_index) 93_update_ids(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, int avoid_index)
94{ 94{
95 for (int i = 0; i < 2; ++i) 95 for (int i = 0; i < 2; ++i)
96 { 96 {
@@ -102,7 +102,7 @@ _update_ids(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd, int avoid_index)
102} 102}
103 103
104EOLIAN static void 104EOLIAN static void
105_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) 105_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_content_add(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Stack_Manager_Data *pd, Efl_Gfx_Entity *subobj, int index EINA_UNUSED)
106{ 106{
107 efl_key_data_set(subobj, "_elm_leaveme", pd->container); 107 efl_key_data_set(subobj, "_elm_leaveme", pd->container);
108 efl_canvas_object_clipper_set(subobj, pd->clipper); 108 efl_canvas_object_clipper_set(subobj, pd->clipper);
@@ -112,7 +112,7 @@ _efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_content_add(Eo *obj EIN
112} 112}
113 113
114EOLIAN static void 114EOLIAN static void
115_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) 115_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_content_del(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Stack_Manager_Data *pd, Efl_Gfx_Entity *subobj, int index)
116{ 116{
117 efl_key_data_set(subobj, "_elm_leaveme", NULL); 117 efl_key_data_set(subobj, "_elm_leaveme", NULL);
118 efl_canvas_object_clipper_set(subobj, NULL); 118 efl_canvas_object_clipper_set(subobj, NULL);
@@ -135,7 +135,7 @@ is_valid(Eo *obj, int index)
135} 135}
136 136
137EOLIAN static void 137EOLIAN static void
138_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd, int from, int to) 138_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, int from, int to)
139{ 139{
140 if (efl_pack_content_get(pd->container, to) == pd->content[1]) 140 if (efl_pack_content_get(pd->container, to) == pd->content[1])
141 return; 141 return;
@@ -175,14 +175,14 @@ _efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_
175} 175}
176 176
177EOLIAN static void 177EOLIAN static void
178_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_size_set(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd, Eina_Size2D size) 178_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_size_set(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, Eina_Size2D size)
179{ 179{
180 pd->page_size = size; 180 pd->page_size = size;
181 _geom_sync(obj, pd); 181 _geom_sync(obj, pd);
182} 182}
183 183
184EOLIAN static void 184EOLIAN static void
185_efl_ui_spotlight_manager_stack_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Manager_Stack_Data *pd) 185_efl_ui_spotlight_stack_manager_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd)
186{ 186{
187 efl_invalidate(efl_super(obj, MY_CLASS)); 187 efl_invalidate(efl_super(obj, MY_CLASS));
188 188
@@ -201,7 +201,7 @@ _efl_ui_spotlight_manager_stack_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_
201} 201}
202 202
203EOLIAN static void 203EOLIAN static void
204_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_animated_transition_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd, Eina_Bool animation) 204_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_animated_transition_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Stack_Manager_Data *pd, Eina_Bool animation)
205{ 205{
206 for (int i = 0; i < 2; ++i) 206 for (int i = 0; i < 2; ++i)
207 { 207 {
@@ -212,10 +212,10 @@ _efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_animated_transition_set
212} 212}
213 213
214EOLIAN static Eina_Bool 214EOLIAN static Eina_Bool
215_efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_animated_transition_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Manager_Stack_Data *pd) 215_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_animated_transition_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Stack_Manager_Data *pd)
216{ 216{
217 return pd->animation; 217 return pd->animation;
218} 218}
219 219
220 220
221#include "efl_ui_spotlight_manager_stack.eo.c" 221#include "efl_ui_spotlight_stack_manager.eo.c"
diff --git a/src/lib/elementary/efl_ui_spotlight_manager_stack.eo b/src/lib/elementary/efl_ui_spotlight_stack_manager.eo
index 2275eb8ff0..6ee2f5acfa 100644
--- a/src/lib/elementary/efl_ui_spotlight_manager_stack.eo
+++ b/src/lib/elementary/efl_ui_spotlight_stack_manager.eo
@@ -1,5 +1,6 @@
1class @beta Efl.Ui.Spotlight.Manager_Stack extends Efl.Ui.Spotlight.Manager 1class @beta Efl.Ui.Spotlight.Stack_Manager extends Efl.Ui.Spotlight.Manager
2{ 2{
3 c_prefix: efl_ui_spotlight_manager_stack;
3 implements { 4 implements {
4 Efl.Ui.Spotlight.Manager.bind; 5 Efl.Ui.Spotlight.Manager.bind;
5 Efl.Ui.Spotlight.Manager.content_add; 6 Efl.Ui.Spotlight.Manager.content_add;
diff --git a/src/lib/elementary/efl_ui_spotlight_util.c b/src/lib/elementary/efl_ui_spotlight_util.c
index c49ebd4d8c..35a8e8e7d6 100644
--- a/src/lib/elementary/efl_ui_spotlight_util.c
+++ b/src/lib/elementary/efl_ui_spotlight_util.c
@@ -12,7 +12,7 @@ typedef struct {
12EOLIAN static Efl_Ui_Spotlight_Container* 12EOLIAN static Efl_Ui_Spotlight_Container*
13_efl_ui_spotlight_util_stack_gen(Efl_Ui_Widget *parent) 13_efl_ui_spotlight_util_stack_gen(Efl_Ui_Widget *parent)
14{ 14{
15 Efl_Ui_Spotlight_Manager *manager = efl_new(EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS); 15 Efl_Ui_Spotlight_Manager *manager = efl_new(EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS);
16 return efl_add(EFL_UI_SPOTLIGHT_CONTAINER_CLASS, parent, 16 return efl_add(EFL_UI_SPOTLIGHT_CONTAINER_CLASS, parent,
17 efl_ui_spotlight_manager_set(efl_added, manager)); 17 efl_ui_spotlight_manager_set(efl_added, manager));
18} 18}
diff --git a/src/lib/elementary/efl_ui_stack.c b/src/lib/elementary/efl_ui_stack.c
index e1769b7603..66c27b76d7 100644
--- a/src/lib/elementary/efl_ui_stack.c
+++ b/src/lib/elementary/efl_ui_stack.c
@@ -18,7 +18,7 @@ _efl_ui_stack_efl_object_constructor(Eo *obj, Efl_Ui_Stack_Data *sd EINA_UNUSED)
18 18
19 obj = efl_constructor(efl_super(obj, MY_CLASS)); 19 obj = efl_constructor(efl_super(obj, MY_CLASS));
20 20
21 stack = efl_new(EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS); 21 stack = efl_new(EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS);
22 efl_ui_spotlight_manager_set(obj, stack); 22 efl_ui_spotlight_manager_set(obj, stack);
23 23
24 return obj; 24 return obj;
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 6606f084de..8dc190097f 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -146,10 +146,10 @@ pub_eo_files = [
146 'efl_ui_focus_manager_window_root.eo', 146 'efl_ui_focus_manager_window_root.eo',
147 'efl_ui_spotlight_container.eo', 147 'efl_ui_spotlight_container.eo',
148 'efl_ui_spotlight_manager.eo', 148 'efl_ui_spotlight_manager.eo',
149 'efl_ui_spotlight_manager_scroll.eo', 149 'efl_ui_spotlight_scroll_manager.eo',
150 'efl_ui_spotlight_manager_stack.eo', 150 'efl_ui_spotlight_stack_manager.eo',
151 'efl_ui_spotlight_indicator.eo', 151 'efl_ui_spotlight_indicator.eo',
152 'efl_ui_spotlight_indicator_icon.eo', 152 'efl_ui_spotlight_icon_indicator.eo',
153 'efl_ui_spotlight_util.eo', 153 'efl_ui_spotlight_util.eo',
154 'efl_ui_tab_pager.eo', 154 'efl_ui_tab_pager.eo',
155 'efl_ui_tab_bar.eo', 155 'efl_ui_tab_bar.eo',
@@ -241,7 +241,7 @@ priv_eo_files = [
241 'efl_ui_homogeneous_model.eo', 241 'efl_ui_homogeneous_model.eo',
242 'efl_ui_exact_model.eo', 242 'efl_ui_exact_model.eo',
243 'efl_ui_average_model.eo', 243 'efl_ui_average_model.eo',
244 'efl_ui_spotlight_manager_plain.eo', 244 'efl_ui_spotlight_plain_manager.eo',
245 'efl_ui_collection_focus_manager.eo', 245 'efl_ui_collection_focus_manager.eo',
246] 246]
247 247
@@ -915,11 +915,11 @@ elementary_src = [
915 'elm_focus_legacy.c', 915 'elm_focus_legacy.c',
916 'efl_ui_spotlight_container.c', 916 'efl_ui_spotlight_container.c',
917 'efl_ui_spotlight_manager.c', 917 'efl_ui_spotlight_manager.c',
918 'efl_ui_spotlight_manager_plain.c', 918 'efl_ui_spotlight_plain_manager.c',
919 'efl_ui_spotlight_manager_scroll.c', 919 'efl_ui_spotlight_scroll_manager.c',
920 'efl_ui_spotlight_manager_stack.c', 920 'efl_ui_spotlight_stack_manager.c',
921 'efl_ui_spotlight_indicator.c', 921 'efl_ui_spotlight_indicator.c',
922 'efl_ui_spotlight_indicator_icon.c', 922 'efl_ui_spotlight_icon_indicator.c',
923 'efl_ui_spotlight_util.c', 923 'efl_ui_spotlight_util.c',
924 'efl_ui_focus_graph.h', 924 'efl_ui_focus_graph.h',
925 'efl_ui_focus_graph.c', 925 'efl_ui_focus_graph.c',