e_comp_wl_surface: move the uniconifiy callback code

move the callback code of E_CLIENT_HOOK_UNICONIFY to e_policy_desk_area.c

Change-Id: Iee35582e3963790db2295e7923c2570aff53be55

diff --git a/src/bin/server/e_comp_wl_subsurface.c b/src/bin/server/e_comp_wl_subsurface.c
index 74dfe6d2675d032dc81c29126ab3b63218481a48..2f88cb916c21f3c0a3a429104d1cdb1874190481 100644 (file)
--- a/src/bin/server/e_comp_wl_subsurface.c
+++ b/src/bin/server/e_comp_wl_subsurface.c
@@ -405,15 +405,6 @@ _e_comp_wl_subsurface_order_commit(E_Client *ec)
    return EINA_TRUE;
 }
 
-static void
-_e_comp_wl_subsurface_cb_ec_uniconify(void *data EINA_UNUSED, E_Client *ec)
-{
-   if (e_object_is_del(E_OBJECT(ec))) return;
-   if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
-
-   _e_comp_wl_subsurface_show(ec);
-}
-
 static E_Client *
 _e_comp_wl_subsurface_above_topmost_get(E_Client *ec)
 {
@@ -536,8 +527,6 @@ end:
 EINTERN Eina_Bool
 e_comp_wl_subsurfaces_init(void)
 {
-   E_LIST_HOOK_APPEND(hooks, E_CLIENT_HOOK_UNICONIFY, _e_comp_wl_subsurface_cb_ec_uniconify,   NULL);
-
    E_LIST_HANDLER_APPEND(handlers, E_EVENT_COMP_OBJECT_ADD, _e_comp_wl_subsurface_cb_comp_object_add, NULL);
 
    return EINA_TRUE;

diff --git a/src/bin/windowmgr/e_policy_desk_area.c b/src/bin/windowmgr/e_policy_desk_area.c
index 822d4578bfb712c9bda2b1558290b78c2091a759..77a335ed485321afa608227970d924c25d9a3805 100644 (file)
--- a/src/bin/windowmgr/e_policy_desk_area.c
+++ b/src/bin/windowmgr/e_policy_desk_area.c
@@ -1189,6 +1189,9 @@ _desk_area_cb_client_uniconify(struct wl_listener *listener, void *data)
            e_view_client_render(e_client_view_get(ec));
         }
    }
+
+   // deal with subsurfaces
+   e_comp_wl_subsurface_show(ec);
 }
 
 static void