From: Changyeon Lee Date: Thu, 22 Feb 2024 07:54:06 +0000 (+0900) Subject: Revert "e_client: do not enable the transform core if the render update lock is set" X-Git-Tag: accepted/tizen/unified/20240228.170406~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F63%2F306663%2F2;p=platform%2Fupstream%2Fenlightenment.git Revert "e_client: do not enable the transform core if the render update lock is set" This reverts commit 3d160e6d4f86e0e514dffc87c2130e90fe4890ec. Change-Id: Ia2ee1995c1d2b035da96ad6c1eb78c4821a39762 --- diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 9ff62ad..3951166 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -149,7 +149,6 @@ static Eina_Bool comp_grabbed = EINA_FALSE; static Eina_List *handlers = NULL; static Eina_List *hooks = NULL; -static Eina_List *comp_hooks = NULL; static Ecore_Event_Handler *action_handler_mouse = NULL; static Ecore_Timer *action_timer = NULL; @@ -1977,15 +1976,8 @@ _e_client_stay_within_canvas_margin(E_Client *ec, int x, int y, int *new_x, int //////////////////////////////////////////////// static void -_e_client_transform_core_activate_update(E_Client *ec) +_e_client_transform_core_activate_set(E_Client *ec, Eina_Bool set) { - Eina_Bool set; - - if (evas_object_visible_get(ec->frame) && e_comp_object_render_update_lock_get(ec->frame)) - set = EINA_TRUE; - else - set = EINA_FALSE; - if (ec->transform_core.activate == set) return; ec->transform_core.activate = set; @@ -2020,7 +2012,7 @@ _e_client_cb_evas_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN ec->want_focus = ec->take_focus = 0; - _e_client_transform_core_activate_update(ec); + _e_client_transform_core_activate_set(ec, EINA_FALSE); if (ec->new_client) return; _e_client_event_hide(ec); @@ -2129,7 +2121,7 @@ _e_client_cb_evas_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN if (e_object_is_del(data)) return; - _e_client_transform_core_activate_update(ec); + _e_client_transform_core_activate_set(ec, EINA_TRUE); _e_client_event_show(ec); EC_CHANGED(ec); @@ -2870,7 +2862,7 @@ _e_client_transform_core_vertices_apply(E_Client *ec, e_comp_object_map_set(obj, map); - if ((ec->transform_core.activate) || (!e_comp_object_render_update_lock_get(ec->frame))) + if (ec->transform_core.activate) e_comp_object_map_enable_set(obj, EINA_TRUE); else e_comp_object_map_enable_set(obj, EINA_FALSE); @@ -3075,25 +3067,6 @@ e_client_idler_before(Eina_Bool *check_focus) TRACE_DS_END(); } -static Eina_Bool -_e_client_cb_hook_comp_render_update_lock_set(void *data, E_Client *ec) -{ - EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_TRUE); - - _e_client_transform_core_activate_update(ec); - - return EINA_TRUE; -} - -static Eina_Bool -_e_client_cb_hook_comp_render_update_lock_unset(void *data, E_Client *ec) -{ - EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_TRUE); - - _e_client_transform_core_activate_update(ec); - - return EINA_TRUE; -} EINTERN Eina_Bool e_client_init(void) @@ -3103,8 +3076,6 @@ e_client_init(void) clients_hash[pix_id] = eina_hash_pointer_new(NULL); E_COMP_WL_HOOK_APPEND(hooks, E_COMP_WL_HOOK_SHELL_SURFACE_READY, _e_client_cb_hook_shell_surface_ready, NULL); - E_COMP_COMP_HOOK_APPEND(comp_hooks, E_COMP_OBJECT_HOOK_RENDER_UPDATE_LOCK_SET, _e_client_cb_hook_comp_render_update_lock_set, NULL); - E_COMP_COMP_HOOK_APPEND(comp_hooks, E_COMP_OBJECT_HOOK_RENDER_UPDATE_LOCK_UNSET, _e_client_cb_hook_comp_render_update_lock_unset, NULL); E_EVENT_CLIENT_ADD = ecore_event_type_new(); E_EVENT_CLIENT_REMOVE = ecore_event_type_new(); @@ -3144,7 +3115,6 @@ e_client_shutdown(void) E_FREE_FUNC(clients_hash[pix_id], eina_hash_free); E_FREE_LIST(hooks, e_comp_wl_hook_del); - E_FREE_LIST(comp_hooks, e_comp_object_hook_del); E_FREE_LIST(handlers, ecore_event_handler_del); }