e_comp_wl_surface: move the iconifiy callback code

move the callback code of E_CLIENT_HOOK_ICONIFY to e_policy_desk_area.c

Change-Id: Ia7fc83dafe512f1d5ba465c781067e32228997cd

diff --git a/src/bin/server/e_comp_wl_subsurface.c b/src/bin/server/e_comp_wl_subsurface.c
index b09d398c0c3858b31daade7ebe6ec3c875258733..74dfe6d2675d032dc81c29126ab3b63218481a48 100644 (file)
--- a/src/bin/server/e_comp_wl_subsurface.c
+++ b/src/bin/server/e_comp_wl_subsurface.c
@@ -405,16 +405,6 @@ _e_comp_wl_subsurface_order_commit(E_Client *ec)
    return EINA_TRUE;
 }
 
-static void
-_e_comp_wl_subsurface_cb_ec_iconify(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;
-
-   /* DON'T iconify subsurface. When iconfied, buffer will be released. */
-   _e_comp_wl_subsurface_hide(ec);
-}
-
 static void
 _e_comp_wl_subsurface_cb_ec_uniconify(void *data EINA_UNUSED, E_Client *ec)
 {
@@ -546,7 +536,6 @@ end:
 EINTERN Eina_Bool
 e_comp_wl_subsurfaces_init(void)
 {
-   E_LIST_HOOK_APPEND(hooks, E_CLIENT_HOOK_ICONIFY,   _e_comp_wl_subsurface_cb_ec_iconify,     NULL);
    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);

diff --git a/src/bin/windowmgr/e_policy_desk_area.c b/src/bin/windowmgr/e_policy_desk_area.c
index 5057a5d4f4b5c6b9af352fdf20985767f09d8944..822d4578bfb712c9bda2b1558290b78c2091a759 100644 (file)
--- a/src/bin/windowmgr/e_policy_desk_area.c
+++ b/src/bin/windowmgr/e_policy_desk_area.c
@@ -1062,6 +1062,9 @@ _desk_area_cb_client_iconify(struct wl_listener *listener, void *data)
              e_client_iconify(child);
           }
      }
+
+   // deal with subsurfaces
+   e_comp_wl_subsurface_hide(ec);
 }
 
 static void