e_policy_visibility: add code to cancel iconify job while handling activate request

Change-Id: If8b884fb7cec3a3241bcc853ae4017982dfb69e0

diff --git a/src/bin/e_policy_visibility.c b/src/bin/e_policy_visibility.c
index dea8703026c4e4c7f66bae2bfa3b79c962c2f1f9..379926b7f3603b2a0b4f4f0e115d38f72342c083 100644 (file)
--- a/src/bin/e_policy_visibility.c
+++ b/src/bin/e_policy_visibility.c
@@ -2361,6 +2361,16 @@ e_policy_visibility_client_lower_job_cancel(E_Client *ec)
    return _e_vis_job_cancel(vc, E_VIS_JOB_TYPE_LOWER);
 }
 
+EINTERN Eina_Bool
+e_policy_visibility_client_iconify_job_cancel(E_Client *ec)
+{
+   if (!ec) return EINA_FALSE;
+   E_VIS_CLIENT_GET_OR_RETURN_VAL(vc, ec, EINA_FALSE);
+
+   VS_INF(ec, "Find and Cancel ICONIFY job...");
+   return _e_vis_job_cancel(vc, E_VIS_JOB_TYPE_ICONIFY);
+}
+
 EINTERN Eina_Bool
 e_policy_visibility_client_uniconify_by_visibility_job_cancel(E_Client *ec)
 {

diff --git a/src/bin/e_policy_visibility.h b/src/bin/e_policy_visibility.h
index e38164caa9cc43055a682b2c31ce2849788dd58c..bff6eb8d3d46e3524f72fac192e1ee1772e764f9 100644 (file)
--- a/src/bin/e_policy_visibility.h
+++ b/src/bin/e_policy_visibility.h
@@ -62,6 +62,7 @@ E_API void                        e_policy_visibility_client_grab_release(E_Vis_
 EINTERN Eina_Bool                   e_policy_visibility_client_grab_cancel(E_Client *ec);
 EINTERN Eina_Bool                   e_policy_visibility_client_hide_job_cancel(E_Client *ec);
 EINTERN Eina_Bool                 e_policy_visibility_client_lower_job_cancel(E_Client *ec);
+EINTERN Eina_Bool                 e_policy_visibility_client_iconify_job_cancel(E_Client *ec);
 EINTERN Eina_Bool                 e_policy_visibility_client_uniconify_by_visibility_job_cancel(E_Client *ec);
 EINTERN Eina_Bool                 e_policy_visibility_client_raising_job_cancel(E_Client *ec);
 E_API E_Pol_Vis_Hook             *e_policy_visibility_hook_add(E_Pol_Vis_Hook_Type type, E_Pol_Vis_Hook_Cb cb, const void *data);

diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c
index 354ac4e7d191ac4d622d311febbfe30934996ec7..67a0c1af3bd58e348f8287543152311d2214af20 100644 (file)
--- a/src/bin/e_policy_wl.c
+++ b/src/bin/e_policy_wl.c
@@ -1475,6 +1475,7 @@ e_policy_wl_activate(E_Client *ec)
    ELOGF("TZPOL", "REAL ACTIVATE", ec);
 
    e_policy_visibility_client_lower_job_cancel(ec);
+   e_policy_visibility_client_iconify_job_cancel(ec);
 
    if ((!starting) && (!ec->focused))
      {