summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2020-01-23 12:55:16 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2020-01-23 12:55:16 +0900
commit09e3972d14aaf2b61690d119660490cf9d9929a4 (patch)
treee0fc9f1596850254aee2af575b10a99fa0113d8d
parent3e21d343492686d38ae8cb488a929e3af07d8d4e (diff)
efl_ui_spotlight: rename Stack_Manager to Fade_Manager
Summary: Since Stack_Manager displays fade in/out transition effects, the class name is renamed from Stack_Manager to Fade_Manager. Depends on D11142 Reviewers: segfaultxavi, bu5hm4n, zmike Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11143
-rw-r--r--src/bin/elementary/test_ui_tab_pager.c2
-rw-r--r--src/examples/elementary/efl_ui_slideshow_example.c2
-rw-r--r--src/lib/elementary/Efl_Ui.h2
-rw-r--r--src/lib/elementary/efl_ui_spotlight_fade_manager.c (renamed from src/lib/elementary/efl_ui_spotlight_stack_manager.c)28
-rw-r--r--src/lib/elementary/efl_ui_spotlight_fade_manager.eo (renamed from src/lib/elementary/efl_ui_spotlight_stack_manager.eo)4
-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.build4
-rw-r--r--src/tests/elementary/efl_ui_test_spotlight.c4
9 files changed, 25 insertions, 25 deletions
diff --git a/src/bin/elementary/test_ui_tab_pager.c b/src/bin/elementary/test_ui_tab_pager.c
index 2500b4d484..1cc0055051 100644
--- a/src/bin/elementary/test_ui_tab_pager.c
+++ b/src/bin/elementary/test_ui_tab_pager.c
@@ -534,7 +534,7 @@ _tran_set_btn_scroll_cb(void *data, const Efl_Event *ev EINA_UNUSED)
534static void 534static void
535_tran_set_btn_stack_cb(void *data, const Efl_Event *ev EINA_UNUSED) 535_tran_set_btn_stack_cb(void *data, const Efl_Event *ev EINA_UNUSED)
536{ 536{
537 Efl_Ui_Spotlight_Scroll_Manager *stack = efl_new(EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS); 537 Efl_Ui_Spotlight_Scroll_Manager *stack = efl_new(EFL_UI_SPOTLIGHT_FADE_MANAGER_CLASS);
538 efl_ui_spotlight_manager_set(data, stack); 538 efl_ui_spotlight_manager_set(data, stack);
539} 539}
540 540
diff --git a/src/examples/elementary/efl_ui_slideshow_example.c b/src/examples/elementary/efl_ui_slideshow_example.c
index f1429843d0..4be9865bd3 100644
--- a/src/examples/elementary/efl_ui_slideshow_example.c
+++ b/src/examples/elementary/efl_ui_slideshow_example.c
@@ -94,7 +94,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
94 efl_event_callback_add(efl_added, EFL_UI_SPOTLIGHT_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_spotlight_indicator_set(container, efl_new(EFL_UI_SPOTLIGHT_ICON_INDICATOR_CLASS)); 96 efl_ui_spotlight_indicator_set(container, efl_new(EFL_UI_SPOTLIGHT_ICON_INDICATOR_CLASS));
97 efl_ui_spotlight_manager_set(container, efl_new(EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS)); 97 efl_ui_spotlight_manager_set(container, efl_new(EFL_UI_SPOTLIGHT_FADE_MANAGER_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 64497913db..c010581c74 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -268,7 +268,7 @@ typedef Eo Efl_Ui_Spotlight_Indicator;
268# include <efl_ui_spotlight_indicator.eo.h> 268# include <efl_ui_spotlight_indicator.eo.h>
269# include <efl_ui_spotlight_icon_indicator.eo.h> 269# include <efl_ui_spotlight_icon_indicator.eo.h>
270# include <efl_ui_spotlight_scroll_manager.eo.h> 270# include <efl_ui_spotlight_scroll_manager.eo.h>
271# include <efl_ui_spotlight_stack_manager.eo.h> 271# include <efl_ui_spotlight_fade_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_spotlight_stack_manager.c b/src/lib/elementary/efl_ui_spotlight_fade_manager.c
index 253a7259f4..da70a3848f 100644
--- a/src/lib/elementary/efl_ui_spotlight_stack_manager.c
+++ b/src/lib/elementary/efl_ui_spotlight_fade_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_Stack_Manager_Data; 17} Efl_Ui_Spotlight_Fade_Manager_Data;
18 18
19#define MY_CLASS EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS 19#define MY_CLASS EFL_UI_SPOTLIGHT_FADE_MANAGER_CLASS
20 20
21static void 21static void
22_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Stack_Manager_Data *pd) 22_geom_sync(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Fade_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_Stack_Manager_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_Stack_Manager_Data *pd = efl_data_scope_safe_get(data, MY_CLASS); 40 Efl_Ui_Spotlight_Fade_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_stack_manager_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, Efl_Ui_Spotlight_Container *spotlight) 61_efl_ui_spotlight_fade_manager_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Spotlight_Fade_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_stack_manager_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_Stack_Manager_Data *pd, int avoid_index) 93_update_ids(Eo *obj, Efl_Ui_Spotlight_Fade_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_Stack_Manager_Data *pd, int avoid_index)
102} 102}
103 103
104EOLIAN static void 104EOLIAN static void
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) 105_efl_ui_spotlight_fade_manager_efl_ui_spotlight_manager_content_add(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Fade_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_stack_manager_efl_ui_spotlight_manager_content_add(Eo *obj EIN
112} 112}
113 113
114EOLIAN static void 114EOLIAN static void
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) 115_efl_ui_spotlight_fade_manager_efl_ui_spotlight_manager_content_del(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Fade_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_stack_manager_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, int from, int to) 138_efl_ui_spotlight_fade_manager_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_Ui_Spotlight_Fade_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_stack_manager_efl_ui_spotlight_manager_switch_to(Eo *obj, Efl_
175} 175}
176 176
177EOLIAN static void 177EOLIAN static void
178_efl_ui_spotlight_stack_manager_efl_ui_spotlight_manager_size_set(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd, Eina_Size2D size) 178_efl_ui_spotlight_fade_manager_efl_ui_spotlight_manager_size_set(Eo *obj, Efl_Ui_Spotlight_Fade_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_stack_manager_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Stack_Manager_Data *pd) 185_efl_ui_spotlight_fade_manager_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_Fade_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_stack_manager_efl_object_invalidate(Eo *obj, Efl_Ui_Spotlight_
201} 201}
202 202
203EOLIAN static void 203EOLIAN static void
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) 204_efl_ui_spotlight_fade_manager_efl_ui_spotlight_manager_animated_transition_set(Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Fade_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_stack_manager_efl_ui_spotlight_manager_animated_transition_set
212} 212}
213 213
214EOLIAN static Eina_Bool 214EOLIAN static Eina_Bool
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) 215_efl_ui_spotlight_fade_manager_efl_ui_spotlight_manager_animated_transition_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spotlight_Fade_Manager_Data *pd)
216{ 216{
217 return pd->animation; 217 return pd->animation;
218} 218}
219 219
220 220
221#include "efl_ui_spotlight_stack_manager.eo.c" 221#include "efl_ui_spotlight_fade_manager.eo.c"
diff --git a/src/lib/elementary/efl_ui_spotlight_stack_manager.eo b/src/lib/elementary/efl_ui_spotlight_fade_manager.eo
index 6ee2f5acfa..2447d92471 100644
--- a/src/lib/elementary/efl_ui_spotlight_stack_manager.eo
+++ b/src/lib/elementary/efl_ui_spotlight_fade_manager.eo
@@ -1,6 +1,6 @@
1class @beta Efl.Ui.Spotlight.Stack_Manager extends Efl.Ui.Spotlight.Manager 1class @beta Efl.Ui.Spotlight.Fade_Manager extends Efl.Ui.Spotlight.Manager
2{ 2{
3 c_prefix: efl_ui_spotlight_manager_stack; 3 c_prefix: efl_ui_spotlight_manager_fade;
4 implements { 4 implements {
5 Efl.Ui.Spotlight.Manager.bind; 5 Efl.Ui.Spotlight.Manager.bind;
6 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 35a8e8e7d6..c7c68da4e0 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_STACK_MANAGER_CLASS); 15 Efl_Ui_Spotlight_Manager *manager = efl_new(EFL_UI_SPOTLIGHT_FADE_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 66c27b76d7..7c9f72f95a 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_STACK_MANAGER_CLASS); 21 stack = efl_new(EFL_UI_SPOTLIGHT_FADE_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 8dc190097f..145d958e21 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -147,7 +147,7 @@ pub_eo_files = [
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_scroll_manager.eo', 149 'efl_ui_spotlight_scroll_manager.eo',
150 'efl_ui_spotlight_stack_manager.eo', 150 'efl_ui_spotlight_fade_manager.eo',
151 'efl_ui_spotlight_indicator.eo', 151 'efl_ui_spotlight_indicator.eo',
152 'efl_ui_spotlight_icon_indicator.eo', 152 'efl_ui_spotlight_icon_indicator.eo',
153 'efl_ui_spotlight_util.eo', 153 'efl_ui_spotlight_util.eo',
@@ -917,7 +917,7 @@ elementary_src = [
917 'efl_ui_spotlight_manager.c', 917 'efl_ui_spotlight_manager.c',
918 'efl_ui_spotlight_plain_manager.c', 918 'efl_ui_spotlight_plain_manager.c',
919 'efl_ui_spotlight_scroll_manager.c', 919 'efl_ui_spotlight_scroll_manager.c',
920 'efl_ui_spotlight_stack_manager.c', 920 'efl_ui_spotlight_fade_manager.c',
921 'efl_ui_spotlight_indicator.c', 921 'efl_ui_spotlight_indicator.c',
922 'efl_ui_spotlight_icon_indicator.c', 922 'efl_ui_spotlight_icon_indicator.c',
923 'efl_ui_spotlight_util.c', 923 'efl_ui_spotlight_util.c',
diff --git a/src/tests/elementary/efl_ui_test_spotlight.c b/src/tests/elementary/efl_ui_test_spotlight.c
index eada2839c9..e26acad108 100644
--- a/src/tests/elementary/efl_ui_test_spotlight.c
+++ b/src/tests/elementary/efl_ui_test_spotlight.c
@@ -645,7 +645,7 @@ EFL_START_TEST (efl_ui_spotlight_animated_transition)
645 ck_assert_int_eq(efl_ui_spotlight_manager_animated_transition_get(efl_ui_spotlight_manager_get(container)), EINA_FALSE); 645 ck_assert_int_eq(efl_ui_spotlight_manager_animated_transition_get(efl_ui_spotlight_manager_get(container)), EINA_FALSE);
646 646
647 //now check with a real spotlight manager 647 //now check with a real spotlight manager
648 efl_ui_spotlight_manager_set(container, efl_new(EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS)); 648 efl_ui_spotlight_manager_set(container, efl_new(EFL_UI_SPOTLIGHT_FADE_MANAGER_CLASS));
649 efl_ui_spotlight_animated_transition_set(container, EINA_TRUE); 649 efl_ui_spotlight_animated_transition_set(container, EINA_TRUE);
650 ck_assert_int_eq(efl_ui_spotlight_animated_transition_get(container), EINA_TRUE); 650 ck_assert_int_eq(efl_ui_spotlight_animated_transition_get(container), EINA_TRUE);
651 ck_assert_int_eq(efl_ui_spotlight_manager_animated_transition_get(efl_ui_spotlight_manager_get(container)), EINA_TRUE); 651 ck_assert_int_eq(efl_ui_spotlight_manager_animated_transition_get(efl_ui_spotlight_manager_get(container)), EINA_TRUE);
@@ -654,7 +654,7 @@ EFL_START_TEST (efl_ui_spotlight_animated_transition)
654 ck_assert_int_eq(efl_ui_spotlight_animated_transition_get(container), EINA_FALSE); 654 ck_assert_int_eq(efl_ui_spotlight_animated_transition_get(container), EINA_FALSE);
655 ck_assert_int_eq(efl_ui_spotlight_manager_animated_transition_get(efl_ui_spotlight_manager_get(container)), EINA_FALSE); 655 ck_assert_int_eq(efl_ui_spotlight_manager_animated_transition_get(efl_ui_spotlight_manager_get(container)), EINA_FALSE);
656 656
657 Eo *manager2 = efl_new(EFL_UI_SPOTLIGHT_STACK_MANAGER_CLASS); 657 Eo *manager2 = efl_new(EFL_UI_SPOTLIGHT_FADE_MANAGER_CLASS);
658 Eina_Bool animated_transition_manager; 658 Eina_Bool animated_transition_manager;
659 efl_add(EFL_UI_SPOTLIGHT_CONTAINER_CLASS, win, 659 efl_add(EFL_UI_SPOTLIGHT_CONTAINER_CLASS, win,
660 efl_ui_spotlight_manager_set(efl_added, manager2), 660 efl_ui_spotlight_manager_set(efl_added, manager2),