From 52771645f65b381dc8b0b3257679ce77a2afdad0 Mon Sep 17 00:00:00 2001 From: junkyu han Date: Tue, 26 Dec 2017 07:57:50 +0000 Subject: [PATCH] Revert "Make boot-animation window as TOP to blocking the sudden appearence of the other app" This reverts commit 7b9a242611338bd8e8ce9ac24baf9c0ee42ba3a1. Change-Id: Ia99198111fc4a7307a1bf0d8fc47f82da54181ea --- src/animation.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/animation.c b/src/animation.c index a23a3c0..d9abd8b 100755 --- a/src/animation.c +++ b/src/animation.c @@ -38,16 +38,6 @@ static struct animation { .animation_type = 0, }; -static void __visibility_changed_cb(void *data, Evas_Object *obj, void *event) -{ - __D("Visibility changed"); - int visibility = (int)(void *)event; - - if (!visibility) - boot_exit(); -} - - static void __win_del_cb(void *data, Evas_Object * obj, void *event_info) { __D("Window delete event received"); @@ -65,10 +55,9 @@ static Evas_Object *__create_window(void) __E("Failed to create a new window"); return NULL; } + elm_win_aux_hint_add(win, "wm.comp.win.always.selective.mode", "1"); elm_win_role_set(win, "alert"); - efl_util_set_notification_window_level(win, EFL_UTIL_NOTIFICATION_LEVEL_TOP); - evas_object_smart_callback_add(s_animation.win, "visibility,changed", __visibility_changed_cb, NULL); - elm_win_aux_hint_add(win, "wm.comp.win.always.selective.mode", "0"); + efl_util_set_notification_window_level(win, EFL_UTIL_NOTIFICATION_LEVEL_HIGH); evas_object_smart_callback_add(win, "delete-request", __win_del_cb, NULL); elm_win_screen_size_get(win, NULL, NULL, &s_animation.win_w, &s_animation.win_h); @@ -110,6 +99,9 @@ static Eina_Bool __end_cb(void *data) __block_display(); } else { __D("EXIT on BOOTING"); + if (vconf_set_int(VCONFKEY_BOOT_ANIMATION_FINISHED, 1) != 0) + __E("Failed to set finished set"); + boot_exit(); } return ECORE_CALLBACK_CANCEL; @@ -119,15 +111,14 @@ static void __animation_finished_cb(void *d, Evas_Object * obj, const char *e, c { if (s_animation.animation_type == TYPE_OFF) { __D("TYPE OFF"); + if (vconf_set_int(VCONFKEY_BOOT_ANIMATION_FINISHED, 1) != 0) + __E("Failed to set finished set"); + ecore_timer_add(1, __end_cb, (void *)TYPE_OFF); } else { __D("TYPE_ON"); - efl_util_set_notification_window_level(s_animation.win, EFL_UTIL_NOTIFICATION_LEVEL_NONE); - ecore_timer_add(10, __end_cb, (void *)TYPE_ON); + __end_cb((void *)TYPE_ON); } - - if (vconf_set_int(VCONFKEY_BOOT_ANIMATION_FINISHED, 1) != 0) - __E("Failed to set finished set"); } static Evas_Object * __create_layout(Evas_Object *win, const char *file_name) -- 2.7.4