discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=4eae850861dca74cb15408d2bfff0779b4a8c0fc
commit 4eae850861dca74cb15408d2bfff0779b4a8c0fc Author: Mike Blumenkrantz <[email protected]> Date: Wed Feb 5 10:48:31 2014 -0500 e_util_client_shadow_state_get() -> e_client_util_shadow_state_get() removals: e_util_client_shadow_state_get --- src/bin/e_client.x | 11 +++++++++++ src/bin/e_comp_object.c | 2 +- src/bin/e_deskmirror.c | 4 ++-- src/bin/e_utils.c | 11 ----------- src/bin/e_utils.h | 2 -- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/bin/e_client.x b/src/bin/e_client.x index 5be3eaa..dbe1fa5 100644 --- a/src/bin/e_client.x +++ b/src/bin/e_client.x @@ -110,3 +110,14 @@ e_client_util_borderless(const E_Client *ec) if (!ec) return EINA_FALSE; return (ec->borderless || ec->mwm.borderless || (!ec->border.name) || (!strcmp(ec->border.name, "borderless"))); } + +static inline Eina_Bool +e_client_util_shadow_state_get(const E_Client *ec) +{ + Eina_Bool on; + if (ec->argb || ec->shaped) return EINA_FALSE; + on = !ec->e.state.video; + if (on) + on = !ec->fullscreen; + return on; +} diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 5fabe51..d8ef33a 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -211,7 +211,7 @@ _e_comp_object_layers_remove(E_Comp_Object *cw) static void _e_comp_object_shadow(E_Comp_Object *cw) { - if (e_util_client_shadow_state_get(cw->ec)) + if (e_client_util_shadow_state_get(cw->ec)) edje_object_signal_emit(cw->frame_object ?: cw->shobj, "e,state,shadow,on", "e"); else edje_object_signal_emit(cw->frame_object ?: cw->shobj, "e,state,shadow,off", "e"); diff --git a/src/bin/e_deskmirror.c b/src/bin/e_deskmirror.c index d868861..d95e59e 100644 --- a/src/bin/e_deskmirror.c +++ b/src/bin/e_deskmirror.c @@ -440,7 +440,7 @@ _mirror_client_new(Mirror *m) evas_object_name_set(mb->frame, "mirror_border"); snprintf(buf, sizeof(buf), "e/deskmirror/frame/%s", m->ec->border.name); e_theme_edje_object_set(mb->frame, "base/theme/borders", buf); - if (e_util_client_shadow_state_get(m->ec)) + if (e_client_util_shadow_state_get(m->ec)) edje_object_signal_emit(mb->frame, "e,state,shadow,on", "e"); else edje_object_signal_emit(mb->frame, "e,state,shadow,off", "e"); @@ -758,7 +758,7 @@ e_deskmirror_mirror_copy(Evas_Object *obj) o = edje_object_add(evas_object_evas_get(obj)); snprintf(buf, sizeof(buf), "e/deskmirror/frame/%s", mb->m->ec->border.name); e_theme_edje_object_set(o, "base/theme/borders", buf); - if (e_util_client_shadow_state_get(mb->m->ec)) + if (e_client_util_shadow_state_get(mb->m->ec)) edje_object_signal_emit(o, "e,state,shadow,on", "e"); else edje_object_signal_emit(o, "e,state,shadow,off", "e"); diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c index ad5033d..3171444 100644 --- a/src/bin/e_utils.c +++ b/src/bin/e_utils.c @@ -1608,14 +1608,3 @@ e_util_evas_objects_above_print_smart(Evas_Object *o) fprintf(stderr, "[%p] - %s(%s) %s\n", a, evas_object_type_get(a), evas_object_name_get(a), evas_object_visible_get(a) ? "VISIBLE" : "HIDDEN"); } } - -EAPI Eina_Bool -e_util_client_shadow_state_get(const E_Client *ec) -{ - Eina_Bool on; - if (ec->argb || ec->shaped) return EINA_FALSE; - on = !ec->e.state.video; - if (on) - on = !ec->fullscreen; - return on; -} diff --git a/src/bin/e_utils.h b/src/bin/e_utils.h index d8225b6..be87c2c 100644 --- a/src/bin/e_utils.h +++ b/src/bin/e_utils.h @@ -69,8 +69,6 @@ EAPI char *e_util_string_append_quoted(char *str, size_t *size, size_t *len, con EAPI void e_util_evas_objects_above_print(Evas_Object *o); EAPI void e_util_evas_objects_above_print_smart(Evas_Object *o); -EAPI Eina_Bool e_util_client_shadow_state_get(const E_Client *ec); - EAPI void e_util_string_list_free(Eina_List *l); static inline E_Comp * --
