e_policy: add code to check the window's geometry while handling lockscreen

there was a bug that the e considered the lockscreen is shown when it request to activate.
so, we add code to check the window's geometry before handling lockscreen.

Change-Id: I27e0d383fdaa8589ec55e47a7db080c72e8774c8

diff --git a/src/bin/e_policy_visibility.c b/src/bin/e_policy_visibility.c
index b9545c870da7e3e4c378360aec21eb1ac0759bb6..f44b7e0ae94eef336ee42d64d3ea940bd51923c1 100644 (file)
--- a/src/bin/e_policy_visibility.c
+++ b/src/bin/e_policy_visibility.c
@@ -1098,7 +1098,10 @@ _e_vis_ec_job_exec(E_Client *ec, E_Vis_Job_Type type)
          if (!ec) break;
          e_client_activate(ec, 1);
          if (e_policy_client_is_lockscreen(ec))
-           e_policy_stack_clients_restack_above_lockscreen(ec, EINA_TRUE);
+           {
+              if (E_CONTAINS(ec->x, ec->y, ec->w, ec->h, ec->zone->x, ec->zone->y, ec->zone->w, ec->zone->h))
+                e_policy_stack_clients_restack_above_lockscreen(ec, EINA_TRUE);
+           }
          else
            e_policy_stack_check_above_lockscreen(ec, ec->layer, NULL, EINA_TRUE);
          break;

diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c
index 3496bfebedc868c65c360ab42603d942e467bc54..85c48a6e12c58bf9e8f9ee169e7f9b11240c2036 100644 (file)
--- a/src/bin/e_policy_wl.c
+++ b/src/bin/e_policy_wl.c
@@ -1343,7 +1343,10 @@ e_policy_wl_activate(E_Client *ec)
      evas_object_raise(ec->frame);
 
    if (e_policy_client_is_lockscreen(ec))
-     e_policy_stack_clients_restack_above_lockscreen(ec, EINA_TRUE);
+     {
+       if (E_CONTAINS(ec->x, ec->y, ec->w, ec->h, ec->zone->x, ec->zone->y, ec->zone->w, ec->zone->h))
+         e_policy_stack_clients_restack_above_lockscreen(ec, EINA_TRUE);
+     }
    else
      e_policy_stack_check_above_lockscreen(ec, ec->layer, NULL, EINA_TRUE);
 }
@@ -1871,7 +1874,10 @@ _tzpol_iface_cb_notilv_set(struct wl_client *client, struct wl_resource *res_tzp
      (res_tzpol, surf, lv, TIZEN_POLICY_ERROR_STATE_NONE);
 
    if (e_policy_client_is_lockscreen(ec))
-     e_policy_stack_clients_restack_above_lockscreen(ec, EINA_TRUE);
+     {
+       if (E_CONTAINS(ec->x, ec->y, ec->w, ec->h, ec->zone->x, ec->zone->y, ec->zone->w, ec->zone->h))
+         e_policy_stack_clients_restack_above_lockscreen(ec, EINA_TRUE);
+     }
    else
      e_policy_stack_check_above_lockscreen(ec, ec->layer, NULL, EINA_TRUE);
 }
@@ -1908,7 +1914,8 @@ e_policy_wl_notification_level_fetch(E_Client *ec)
    if (changed_stack &&
        e_policy_client_is_lockscreen(ec))
      {
-        e_policy_stack_clients_restack_above_lockscreen(ec, EINA_TRUE);
+        if (E_CONTAINS(ec->x, ec->y, ec->w, ec->h, ec->zone->x, ec->zone->y, ec->zone->w, ec->zone->h))
+          e_policy_stack_clients_restack_above_lockscreen(ec, EINA_TRUE);
      }
 }