use e_client_layer_set api for client stack change

if it has only purpose for changing the evas obj layer(such as ibar
   effect animation temporarily, or quickpanel mover generation)
use evas_object_layer_set, but if it is about the client layer policy change
use e_client_layer_set api. because it handles the exception of
layer_pending and layer_block.

Change-Id: I5d25b4ec15d9f3ba4ce10ad467d60ee74733f1c2

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 4480626..0e8a63f 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -5811,7 +5811,7 @@ e_client_fullscreen(E_Client *ec, E_Fullscreen policy)
    e_hints_window_size_set(ec);
 
    ec->saved.layer = ec->layer;
-   evas_object_layer_set(ec->frame, E_LAYER_CLIENT_FULLSCREEN);
+   e_client_layer_set(ec, E_LAYER_CLIENT_FULLSCREEN);
 
    ec->fullscreen = 1;
    if ((eina_list_count(e_comp->zones) > 1) || 
@@ -5863,7 +5863,7 @@ e_client_unfullscreen(E_Client *ec)
      e_client_maximize(ec, (e_config->maximize_policy & E_MAXIMIZE_TYPE) |
                        ec->saved.maximized);
 
-   evas_object_layer_set(ec->frame, ec->saved.layer);
+   e_client_layer_set(ec, ec->saved.layer);
 
    e_hints_window_fullscreen_set(ec, 0);
    _e_client_event_simple(ec, E_EVENT_CLIENT_UNFULLSCREEN);
@@ -6133,7 +6133,7 @@ e_client_pinned_set(E_Client *ec, Eina_Bool set)
    else
      layer = E_LAYER_CLIENT_NORMAL;
 
-   evas_object_layer_set(ec->frame, layer);
+   e_client_layer_set(ec, layer);
 
    ec->border.changed = 1;
    EC_CHANGED(ec);

diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c
index 5ee9f3d..be3b7b7 100644 (file)
--- a/src/bin/e_comp_wl_data.c
+++ b/src/bin/e_comp_wl_data.c
@@ -429,8 +429,7 @@ _e_comp_wl_data_device_cb_drag_start(struct wl_client *client, struct wl_resourc
 
              ec->lock_focus_out = ec->override = 1;
              ec->icccm.title = eina_stringshare_add("noshadow");
-             ec->layer = E_LAYER_CLIENT_DRAG;
-             evas_object_layer_set(ec->frame, E_LAYER_CLIENT_DRAG);
+             e_client_layer_set(ec, E_LAYER_CLIENT_DRAG);
              e_client_focus_stack_set(eina_list_remove(e_client_focus_stack_get(), ec));
              EC_CHANGED(ec);
              e_comp_wl->drag_client = ec;

diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index d2fe38d..f3c4948 100644 (file)
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -123,8 +123,7 @@ _e_comp_wl_input_pointer_cb_cursor_set(struct wl_client *client, struct wl_resou
         ec->comp_data->shell.configure = _e_comp_wl_input_pointer_configure;
         ec->comp_data->shell.map = _e_comp_wl_input_pointer_map;
 
-        evas_object_layer_set(ec->frame, E_LAYER_CLIENT_CURSOR);
-        ec->layer = E_LAYER_CLIENT_CURSOR;
+        e_client_layer_set(ec, E_LAYER_CLIENT_CURSOR);
         ec->is_cursor = EINA_TRUE;
      }
 

diff --git a/src/bin/e_magnifier.c b/src/bin/e_magnifier.c
index 9137440..3dc77a7 100644 (file)
--- a/src/bin/e_magnifier.c
+++ b/src/bin/e_magnifier.c
@@ -849,7 +849,7 @@ _e_magnifier_owner_set(E_Client *ec)
 
    ec->is_magnifier = EINA_TRUE;
    ec->exp_iconify.deiconify_update = EINA_FALSE;
-   evas_object_layer_set(ec->frame, E_LAYER_CLIENT_ALERT_HIGH);
+   e_client_layer_set(ec, E_LAYER_CLIENT_ALERT_HIGH);
 
    evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_MOVE, _e_magnifier_cb_owner_move_resize, NULL);
    evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_RESIZE, _e_magnifier_cb_owner_move_resize, NULL);

diff --git a/src/bin/e_policy.c b/src/bin/e_policy.c
index 33b2e41..037074c 100644 (file)
--- a/src/bin/e_policy.c
+++ b/src/bin/e_policy.c
@@ -667,7 +667,7 @@ _e_policy_cb_hook_client_eval_pre_new_client(void *d EINA_UNUSED, E_Client *ec)
 
         EINA_SAFETY_ON_NULL_RETURN(ec->frame);
         if (ec->layer < E_LAYER_CLIENT_ABOVE)
-          evas_object_layer_set(ec->frame, E_LAYER_CLIENT_ABOVE);
+          e_client_layer_set(ec, E_LAYER_CLIENT_ABOVE);
      }
    if (e_policy_client_is_noti(ec))
      {
@@ -676,7 +676,7 @@ _e_policy_cb_hook_client_eval_pre_new_client(void *d EINA_UNUSED, E_Client *ec)
              ly = evas_object_layer_get(ec->frame);
              ELOGF("NOTI", "         |ec->layer:%d object->layer:%d", ec, ec->layer, ly);
              if (ly != ec->layer)
-               evas_object_layer_set(ec->frame, ec->layer);
+               e_client_layer_set(ec, ec->layer);
           }
      }
 
@@ -685,7 +685,7 @@ _e_policy_cb_hook_client_eval_pre_new_client(void *d EINA_UNUSED, E_Client *ec)
         if (ec->frame && !ec->parent)
           {
              if (ec->layer != E_POLICY_DIALOG_LAYER)
-               evas_object_layer_set(ec->frame, E_POLICY_DIALOG_LAYER);
+               e_client_layer_set(ec, E_POLICY_DIALOG_LAYER);
           }
      }
 
@@ -694,7 +694,7 @@ _e_policy_cb_hook_client_eval_pre_new_client(void *d EINA_UNUSED, E_Client *ec)
         if (ec->frame)
           {
              if (ec->layer != E_LAYER_CLIENT_ABOVE)
-               evas_object_layer_set(ec->frame, E_LAYER_CLIENT_ABOVE);
+               e_client_layer_set(ec, E_LAYER_CLIENT_ABOVE);
           }
      }
 
@@ -703,9 +703,8 @@ _e_policy_cb_hook_client_eval_pre_new_client(void *d EINA_UNUSED, E_Client *ec)
         if (ec->frame)
           {
              if (ec->layer != E_POLICY_TOAST_POPUP_LAYER)
-               evas_object_layer_set(ec->frame, E_POLICY_TOAST_POPUP_LAYER);
+               e_client_layer_set(ec, E_POLICY_TOAST_POPUP_LAYER);
           }
-        ec->layer = E_POLICY_TOAST_POPUP_LAYER;
      }
    if (e_policy_client_is_cbhm(ec))
      {
@@ -714,11 +713,8 @@ _e_policy_cb_hook_client_eval_pre_new_client(void *d EINA_UNUSED, E_Client *ec)
 
    if (e_policy_client_is_magnifier(ec))
      {
-        if (ec->frame)
-          {
-             if (ec->layer != E_LAYER_CLIENT_ALERT_HIGH)
-               evas_object_layer_set(ec->frame, E_LAYER_CLIENT_ALERT_HIGH);
-          }
+        if (ec->layer != E_LAYER_CLIENT_ALERT_HIGH)
+          e_client_layer_set(ec, E_LAYER_CLIENT_ALERT_HIGH);
      }
 }
 

diff --git a/src/bin/e_policy_stack.c b/src/bin/e_policy_stack.c
index e3a9ece..e1c3af7 100644 (file)
--- a/src/bin/e_policy_stack.c
+++ b/src/bin/e_policy_stack.c
@@ -572,8 +572,7 @@ e_policy_stack_check_above_lockscreen(E_Client *ec, E_Layer layer, E_Layer *new_
                   if (ec->layer == lock_layer)
                     evas_object_raise(ec->frame);
                   else
-                    evas_object_layer_set(ec->frame, lock_layer);
-                  ec->layer = lock_layer;
+                    e_client_layer_set(ec, lock_layer);
                }
 
              if (new_layer)
@@ -586,8 +585,7 @@ e_policy_stack_check_above_lockscreen(E_Client *ec, E_Layer layer, E_Layer *new_
                   if (ec->layer != layer)
                     {
                        ELOGF("CHANGE to Lockscreen layer", "AboveLock|layer: %d -> %d", ec, ec->layer, lock_layer);
-                       evas_object_layer_set(ec->frame, lock_layer);
-                       ec->layer = lock_layer;
+                       e_client_layer_set(ec, lock_layer);
                     }
                }
 

diff --git a/src/bin/e_policy_visibility.c b/src/bin/e_policy_visibility.c
index d23b7e9..c8a5de6 100644 (file)
--- a/src/bin/e_policy_visibility.c
+++ b/src/bin/e_policy_visibility.c
@@ -1604,7 +1604,7 @@ _e_vis_ec_job_exec(E_Client *ec, E_Vis_Job_Type type)
          break;
       case E_VIS_JOB_TYPE_LAYER_LOWER:
          e_comp_canvas_norender_pop();
-         if (vc) evas_object_layer_set(ec->frame, vc->layer);
+         if (vc) e_client_layer_set(ec, vc->layer);
          break;
       case E_VIS_JOB_TYPE_ICONIFY:
          e_comp_canvas_norender_pop();

diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c
index 6d5dd92..075884c 100644 (file)
--- a/src/bin/e_policy_wl.c
+++ b/src/bin/e_policy_wl.c
@@ -1812,12 +1812,12 @@ _tzpol_iface_cb_role_set(struct wl_client *client EINA_UNUSED, struct wl_resourc
    /* TODO: support multiple roles */
    if (!e_util_strcmp("tv-volume-popup", role))
      {
-        evas_object_layer_set(ec->frame, E_LAYER_CLIENT_NOTIFICATION_LOW);
+        e_client_layer_set(ec, E_LAYER_CLIENT_NOTIFICATION_LOW);
         ec->lock_client_location = 1;
      }
    else if (!e_util_strcmp("e_demo", role))
      {
-        evas_object_layer_set(ec->frame, E_LAYER_CLIENT_NOTIFICATION_HIGH);
+        e_client_layer_set(ec, E_LAYER_CLIENT_NOTIFICATION_HIGH);
         ec->lock_client_location = 1;
      }
    else if (!e_util_strcmp("cbhm", role))
@@ -1828,8 +1828,7 @@ _tzpol_iface_cb_role_set(struct wl_client *client EINA_UNUSED, struct wl_resourc
    else if (!e_util_strcmp("wl_pointer-cursor", role))
      {
         ELOGF("TZPOL", "Set CURSOR role", ec);
-        evas_object_layer_set(ec->frame, E_LAYER_CLIENT_CURSOR);
-        ec->layer = E_LAYER_CLIENT_CURSOR;
+        e_client_layer_set(ec, E_LAYER_CLIENT_CURSOR);
         ec->is_cursor = EINA_TRUE;
      }
 }
@@ -1850,12 +1849,7 @@ _tzpol_iface_cb_type_set(struct wl_client *client EINA_UNUSED, struct wl_resourc
          win_type = E_WINDOW_TYPE_NORMAL;
          if (ec->layer != E_LAYER_CLIENT_NORMAL)
            {
-              ec->layer = E_LAYER_CLIENT_NORMAL;
-              if (ec->frame)
-                {
-                   if (ec->layer != evas_object_layer_get(ec->frame))
-                     evas_object_layer_set(ec->frame, ec->layer);
-                }
+              e_client_layer_set(ec, E_LAYER_CLIENT_NORMAL);
            }
          break;
 
@@ -1943,19 +1937,17 @@ _tzpol_notilv_set(E_Client *ec, int lv)
       default: ly = E_LAYER_CLIENT_NOTIFICATION_LOW;    break;
      }
 
-   if (ly != evas_object_layer_get(ec->frame))
+   if (ec->layer != ly)
      {
         if (ly == E_LAYER_CLIENT_NORMAL)
           e_policy_animatable_lock(ec, E_POLICY_ANIMATABLE_LAYER, 0);
         else
           e_policy_animatable_lock(ec, E_POLICY_ANIMATABLE_LAYER, 1);
 
-        evas_object_layer_set(ec->frame, ly);
+        e_client_layer_set(ec, ly);
      }
 
    e_policy_hook_call(E_POLICY_HOOK_CLIENT_NOTILAYER_SET, ec);
-
-   ec->layer = ly;
 }
 
 static void
@@ -2465,8 +2457,7 @@ _e_policy_wl_aux_hint_apply(E_Client *ec)
                             pend = e_policy_visibility_client_layer_lower(ec, original_layer);
                             if (!pend)
                               {
-                                 evas_object_layer_set(ec->frame, original_layer);
-                                 ec->layer = original_layer;
+                                 e_client_layer_set(ec, original_layer);
                               }
                          }
                     }
@@ -2816,9 +2807,9 @@ _e_policy_wl_floating_mode_apply(E_Client *ec, Eina_Bool floating)
    if (ec->frame)
      {
         if (floating)
-          evas_object_layer_set(ec->frame, E_LAYER_CLIENT_ABOVE);
+          e_client_layer_set(ec, E_LAYER_CLIENT_ABOVE);
         else
-          evas_object_layer_set(ec->frame, E_LAYER_CLIENT_NORMAL);
+          e_client_layer_set(ec, E_LAYER_CLIENT_NORMAL);
      }
 
    EC_CHANGED(ec);
@@ -2866,15 +2857,15 @@ _tzpol_iface_cb_stack_mode_set(struct wl_client *client EINA_UNUSED, struct wl_r
      {
         if (mode == TIZEN_POLICY_STACK_MODE_ABOVE)
           {
-             evas_object_layer_set(ec->frame, E_LAYER_CLIENT_ABOVE);
+             e_client_layer_set(ec, E_LAYER_CLIENT_ABOVE);
           }
         else if (mode == TIZEN_POLICY_STACK_MODE_BELOW)
           {
-             evas_object_layer_set(ec->frame, E_LAYER_CLIENT_BELOW);
+             e_client_layer_set(ec, E_LAYER_CLIENT_BELOW);
           }
         else
           {
-             evas_object_layer_set(ec->frame, E_LAYER_CLIENT_NORMAL);
+             e_client_layer_set(ec, E_LAYER_CLIENT_NORMAL);
           }
         EC_CHANGED(ec);
      }

diff --git a/src/bin/e_test_helper.c b/src/bin/e_test_helper.c
index 24d5503..1cf26ca 100644 (file)
--- a/src/bin/e_test_helper.c
+++ b/src/bin/e_test_helper.c
@@ -1029,7 +1029,7 @@ _e_test_helper_cb_set_noti_level(const Eldbus_Service_Interface *iface EINA_UNUS
         ec = e_pixmap_find_client_by_res_id(win);
         if (!ec) return reply;
 
-        evas_object_layer_set(ec->frame, layer);
+        e_client_layer_set(ec, layer);
      }
 
    return reply;

diff --git a/src/bin/services/e_service_lockscreen.c b/src/bin/services/e_service_lockscreen.c
index 75924c6..91bf359 100644 (file)
--- a/src/bin/services/e_service_lockscreen.c
+++ b/src/bin/services/e_service_lockscreen.c
@@ -12,10 +12,9 @@ e_service_lockscreen_client_set(E_Client *ec)
    e_client_window_role_set(ec, "lockscreen");
 
    // set lockscreen layer
-   if (E_LAYER_CLIENT_NOTIFICATION_LOW > evas_object_layer_get(ec->frame))
+   if (E_LAYER_CLIENT_NOTIFICATION_LOW > ec->layer)
      {
-        evas_object_layer_set(ec->frame, E_LAYER_CLIENT_NOTIFICATION_LOW);
-        ec->layer = E_LAYER_CLIENT_NOTIFICATION_LOW;
+        e_client_layer_set(ec, E_LAYER_CLIENT_NOTIFICATION_LOW);
      }
 
    return EINA_TRUE;

diff --git a/src/bin/services/e_service_quickpanel.c b/src/bin/services/e_service_quickpanel.c
index f56a996..50b3807 100644 (file)
--- a/src/bin/services/e_service_quickpanel.c
+++ b/src/bin/services/e_service_quickpanel.c
@@ -1972,8 +1972,7 @@ e_service_quickpanel_client_add(E_Client *ec, E_Service_Quickpanel_Type type)
 
    // set quickpanel layer
    if (E_POLICY_QUICKPANEL_LAYER != evas_object_layer_get(ec->frame))
-     evas_object_layer_set(ec->frame, E_POLICY_QUICKPANEL_LAYER);
-   ec->layer = E_POLICY_QUICKPANEL_LAYER;
+     e_client_layer_set(ec, E_POLICY_QUICKPANEL_LAYER);
 
    // set skip iconify
    ec->exp_iconify.skip_iconify = 1;

diff --git a/src/bin/services/e_service_scrsaver.c b/src/bin/services/e_service_scrsaver.c
index f8ecdb6..2c453fe 100644 (file)
--- a/src/bin/services/e_service_scrsaver.c
+++ b/src/bin/services/e_service_scrsaver.c
@@ -10,11 +10,10 @@ e_service_scrsaver_client_set(E_Client *ec)
    ELOGF("SCRSAVER","Set Client", ec);
 
    // set screensaver layer
-   if (E_POLICY_SCRSAVER_LAYER != evas_object_layer_get(ec->frame))
+   if (E_POLICY_SCRSAVER_LAYER != ec->layer)
      {
-        evas_object_layer_set(ec->frame, E_POLICY_SCRSAVER_LAYER);
+        e_client_layer_set(ec, E_POLICY_SCRSAVER_LAYER);
      }
-   ec->layer = E_POLICY_SCRSAVER_LAYER;
 
    return EINA_TRUE;
 }

diff --git a/src/bin/services/e_service_softkey.c b/src/bin/services/e_service_softkey.c
index f7976f4..92ecedc 100644 (file)
--- a/src/bin/services/e_service_softkey.c
+++ b/src/bin/services/e_service_softkey.c
@@ -230,11 +230,10 @@ e_service_softkey_client_set(E_Client *ec)
    e_client_window_role_set(ec, "softkey");
 
    // set softkey layer
-   if (E_POLICY_SOFTKEY_LAYER != evas_object_layer_get(ec->frame))
+   if (E_POLICY_SOFTKEY_LAYER != ec->layer)
      {
-        evas_object_layer_set(ec->frame, E_POLICY_SOFTKEY_LAYER);
+        e_client_layer_set(ec, E_POLICY_SOFTKEY_LAYER);
      }
-   ec->layer = E_POLICY_SOFTKEY_LAYER;
 
    // set skip iconify
    ec->exp_iconify.skip_iconify = 1;

diff --git a/src/bin/services/e_service_volume.c b/src/bin/services/e_service_volume.c
index 2ce2734..bf991e8 100644 (file)
--- a/src/bin/services/e_service_volume.c
+++ b/src/bin/services/e_service_volume.c
@@ -289,11 +289,10 @@ e_service_volume_client_set(E_Client *ec)
       e_client_hook_add(E_CLIENT_HOOK_DEL, _volume_hook_client_del, NULL);
 
    // set volume layer
-   if (E_POLICY_VOLUME_LAYER != evas_object_layer_get(ec->frame))
+   if (E_POLICY_VOLUME_LAYER != ec->layer)
      {
-        evas_object_layer_set(ec->frame, E_POLICY_VOLUME_LAYER);
+        e_client_layer_set(ec, E_POLICY_VOLUME_LAYER);
      }
-   ec->layer = E_POLICY_VOLUME_LAYER;
 
    // set skip iconify
    ec->exp_iconify.skip_iconify = 1;