deiconify_approve: check transient child while finding above window when the win...

When an app requested to lower/iconify window, we check its above window.
If above window was full size non-alpha window, then we didn't operate the deiconify_approve functionality.
But there was no code to check whether the above window was child of the window or not.
If the above window is child window, then we skip it.

Change-Id: I9f78b8e453ba1a937ca650ba02344c9c6327d45c

diff --git a/src/bin/e_policy_visibility.c b/src/bin/e_policy_visibility.c
index 9c2b497f1f21cbbc5d166bd1b6941cc0953a7863..be73ffe0a45e4053bfbc21ab9cc9058771a22a59 100644 (file)
--- a/src/bin/e_policy_visibility.c
+++ b/src/bin/e_policy_visibility.c
@@ -45,6 +45,7 @@ static Eina_Bool         _e_vis_ec_activity_check(E_Client *ec, Eina_Bool check_
 static void              _e_vis_ec_job_exec(E_Client *ec, E_Vis_Job_Type type);
 static void              _e_vis_ec_setup(E_Client *ec);
 static void              _e_vis_ec_reset(E_Client *ec);
+static Eina_Bool         _e_vis_ec_above_is_non_alpha_visible(E_Client *ec, Eina_Bool check_child);
 static Eina_Bool         _e_vis_ec_below_uniconify(E_Client *ec);
 static void              _e_vis_cb_child_launch_done(void *data, Evas_Object *obj, const char *signal, const char *source);
 static void              _e_vis_update_foreground_job_queue(void);
@@ -874,7 +875,10 @@ _e_vis_client_grab_clear_cb(void *data)
    VS_INF(grab->vc->ec, "FORCE CLEAR! Grab %s, cur state:%d", grab->name, grab->vc->state);
 
    if (grab->vc->state == E_VIS_ICONIFY_STATE_RUNNING_UNICONIFY)
-     _e_vis_ec_below_uniconify(grab->vc->ec);
+     {
+        if (!_e_vis_ec_above_is_non_alpha_visible(grab->vc->ec, EINA_FALSE))
+          _e_vis_ec_below_uniconify(grab->vc->ec);
+     }
 
    grab->deleted = 1;
    _e_vis_client_grab_remove(grab->vc, grab);
@@ -1186,7 +1190,7 @@ _e_vis_ec_foreground_check(E_Client *ec, Eina_Bool with_transients)
 }
 
 static Eina_Bool
-_e_vis_ec_above_is_non_alpha_visible(E_Client *ec)
+_e_vis_ec_above_is_non_alpha_visible(E_Client *ec, Eina_Bool check_child)
 {
    E_Client *above;
    Eina_Bool is_non_alpha_visible = EINA_FALSE;
@@ -1195,6 +1199,7 @@ _e_vis_ec_above_is_non_alpha_visible(E_Client *ec)
      {
         if (e_client_util_ignored_get(above)) continue;
         if (!E_CONTAINS(above->x, above->y, above->w, above->h, ec->x, ec->y, ec->w, ec->h)) continue;
+        if (check_child && (above->parent == ec)) continue;
 
         if (above->visibility.obscured == E_VISIBILITY_UNOBSCURED)
           {
@@ -1213,9 +1218,6 @@ _e_vis_ec_below_activity_clients_get(E_Client *ec, Eina_List **below_list)
 {
    E_Client *below;
 
-   if (_e_vis_ec_above_is_non_alpha_visible(ec))
-     return;
-
    for (below = e_client_below_get(ec); below; below = e_client_below_get(below))
      {
         if (!_e_vis_ec_activity_check(below, EINA_FALSE)) continue;
@@ -1404,6 +1406,12 @@ _e_vis_intercept_hide(void *data EINA_UNUSED, E_Client *ec)
         return EINA_TRUE;
      }
 
+   if (_e_vis_ec_above_is_non_alpha_visible(ec, EINA_FALSE))
+     {
+        VS_DBG(ec, "Obscured by above window.");
+        return EINA_TRUE;
+     }
+
    if (!_e_vis_ec_below_uniconify(ec))
      {
         VS_DBG(ec, "Failed to uniconify below client");
@@ -1526,6 +1534,12 @@ e_policy_visibility_client_lower(E_Client *ec)
         return EINA_FALSE;
      }
 
+   if (_e_vis_ec_above_is_non_alpha_visible(ec, EINA_TRUE))
+     {
+        VS_DBG(ec, "Obscured by above window.");
+        return EINA_FALSE;
+     }
+
    if (!_e_vis_ec_below_uniconify(ec))
      {
         VS_DBG(ec, "Failed to uniconify below client");
@@ -1555,6 +1569,12 @@ e_policy_visibility_client_iconify(E_Client *ec)
         return EINA_FALSE;
      }
 
+   if (_e_vis_ec_above_is_non_alpha_visible(ec, EINA_TRUE))
+     {
+        VS_DBG(ec, "Obscured by above window.");
+        return EINA_FALSE;
+     }
+
    if (!_e_vis_ec_below_uniconify(ec))
      {
         VS_DBG(ec, "Failed to uniconify below client");
@@ -1652,6 +1672,12 @@ e_policy_visibility_client_layer_lower(E_Client *ec, E_Layer layer)
         return EINA_FALSE;
      }
 
+   if (_e_vis_ec_above_is_non_alpha_visible(ec, EINA_TRUE))
+     {
+        VS_DBG(ec, "Obscured by above window.");
+        return EINA_FALSE;
+     }
+
    if (!_e_vis_ec_below_uniconify(ec))
      {
         VS_DBG(ec, "Failed to uniconify below client");