summaryrefslogtreecommitdiff
path: root/src/lib/edje
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-02-11 12:11:39 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2019-02-11 12:34:12 +0100
commit1b568327c4feca6ac79863551abf1507bb090c55 (patch)
tree76d2ed617f688e12a956c55d511d874296dab014 /src/lib/edje
parentb805f11c89ae5a43b6e74bfe2856beb35483a182 (diff)
efl_gfx_color_class: make this a mixin and move color_class_code here
Summary: color_class_code seems to only have been added to efl_gfx_color in order to share the hex conversion code, but this is trivial to do when it's in another class and makes the api more sensible ref T7559 Reviewers: segfaultxavi, bu5hm4n, cedric Reviewed By: segfaultxavi Subscribers: #reviewers, #committers Tags: #efl_api Maniphest Tasks: T7559 Differential Revision: https://phab.enlightenment.org/D7898
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_main.c6
-rw-r--r--src/lib/edje/edje_private.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/edje/edje_main.c b/src/lib/edje/edje_main.c
index 1417309250..dc2c35cba5 100644
--- a/src/lib/edje/edje_main.c
+++ b/src/lib/edje/edje_main.c
@@ -84,7 +84,7 @@ edje_init(void)
84 _edje_scale = FROM_DOUBLE(1.0); 84 _edje_scale = FROM_DOUBLE(1.0);
85 _edje_global_obj = efl_add(EDJE_GLOBAL_CLASS, efl_main_loop_get()); 85 _edje_global_obj = efl_add(EDJE_GLOBAL_CLASS, efl_main_loop_get());
86 EINA_SAFETY_ON_TRUE_GOTO(!_edje_global_obj, shutdown_efreet); 86 EINA_SAFETY_ON_TRUE_GOTO(!_edje_global_obj, shutdown_efreet);
87 EINA_SAFETY_ON_TRUE_GOTO(!efl_loop_register(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj), shutdown_efreet); 87 EINA_SAFETY_ON_TRUE_GOTO(!efl_loop_register(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_MIXIN, _edje_global_obj), shutdown_efreet);
88 EINA_SAFETY_ON_TRUE_GOTO(!efl_loop_register(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj), shutdown_efreet); 88 EINA_SAFETY_ON_TRUE_GOTO(!efl_loop_register(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj), shutdown_efreet);
89 EINA_SAFETY_ON_TRUE_GOTO(!efl_loop_register(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj), shutdown_efreet); 89 EINA_SAFETY_ON_TRUE_GOTO(!efl_loop_register(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj), shutdown_efreet);
90 90
@@ -154,7 +154,7 @@ shutdown_all:
154 _edje_edd_shutdown(); 154 _edje_edd_shutdown();
155 if (_edje_global_obj) 155 if (_edje_global_obj)
156 { 156 {
157 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj); 157 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_MIXIN, _edje_global_obj);
158 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj); 158 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj);
159 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj); 159 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj);
160 efl_del(_edje_global_obj); 160 efl_del(_edje_global_obj);
@@ -213,7 +213,7 @@ _edje_shutdown_core(void)
213 _edje_text_class_hash_free(); 213 _edje_text_class_hash_free();
214 _edje_size_class_hash_free(); 214 _edje_size_class_hash_free();
215 _edje_edd_shutdown(); 215 _edje_edd_shutdown();
216 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj); 216 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_MIXIN, _edje_global_obj);
217 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj); 217 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj);
218 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj); 218 efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj);
219 efl_del(_edje_global_obj); 219 efl_del(_edje_global_obj);
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 6b7cf50ffc..3721d28bdf 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -2486,7 +2486,7 @@ static inline Edje_Global *
2486_edje_global(void) 2486_edje_global(void)
2487{ 2487{
2488#ifndef NDEBUG 2488#ifndef NDEBUG
2489 return efl_provider_find(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE); 2489 return efl_provider_find(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_MIXIN);
2490#else 2490#else
2491 extern Edje_Global *_edje_global_obj; 2491 extern Edje_Global *_edje_global_obj;
2492 return _edje_global_obj; 2492 return _edje_global_obj;