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: Ia73dba859e65e52057d526ef78e3727c2304ba9d

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 9ac61875651707856b36d6161ecad9055f21b4bb..1a4ea1dacfa9385e14fdb845ba6a1c52368eaae5 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -5574,7 +5574,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) || 
@@ -5626,7 +5626,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);
@@ -5900,7 +5900,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 5ee9f3d5b247fb7254b0ba3689aa2db0616866ff..be3b7b72bca8bd2b515840db5dbb6a57a0008d02 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 fc2a9b1f2a6e5c22cdf4cb9c0821e25ee91030cd..27b0ab0a77375e9609a53fa5b06128adc3374929 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_policy.c b/src/bin/e_policy.c
index bd336bb26b09fc43a00c3e96cecc35722016cc44..8612a34fb81fc341bb9857441dec28d271c82559 100644 (file)
--- a/src/bin/e_policy.c
+++ b/src/bin/e_policy.c
@@ -662,7 +662,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))
      {
@@ -671,7 +671,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->pixmap, ec, ec->layer, ly);
              if (ly != ec->layer)
-               evas_object_layer_set(ec->frame, ec->layer);
+               e_client_layer_set(ec, ec->layer);
           }
      }
 
@@ -680,7 +680,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);
           }
      }
 
@@ -689,7 +689,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);
           }
      }
 
@@ -698,9 +698,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))
      {

diff --git a/src/bin/e_policy_stack.c b/src/bin/e_policy_stack.c
index cc1021c0e41aa9a02c49e9273a39d2d6d4c47c68..8e80424c4cf0a81d5c25db7786684617a4afa7ea 100644 (file)
--- a/src/bin/e_policy_stack.c
+++ b/src/bin/e_policy_stack.c
@@ -566,8 +566,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)
@@ -580,8 +579,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->pixmap, 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 c34103a534ef3d3af433893c2e4cf1eaffa9b7ef..2912aa94718345057c19f93e9a5137975f6b6b62 100644 (file)
--- a/src/bin/e_policy_visibility.c
+++ b/src/bin/e_policy_visibility.c
@@ -1556,7 +1556,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 fcee2b1a2e9d372d699b4c2b87633ec5e438b598..7653dac2fff25eb9821681b660fba727b21987c7 100644 (file)
--- a/src/bin/e_policy_wl.c
+++ b/src/bin/e_policy_wl.c
@@ -1675,12 +1675,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))
@@ -1691,8 +1691,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->pixmap, 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;
      }
 }
@@ -1713,12 +1712,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;
 
@@ -1806,17 +1800,15 @@ _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);
      }
-
-   ec->layer = ly;
 }
 
 static void
@@ -2335,8 +2327,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);
                               }
                          }
                     }
@@ -2739,9 +2730,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);
@@ -2789,15 +2780,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 d749fbce6e4e2fea37e16a30e711781d6069098a..8688b0d0e9e990929658bc866146446edd4d5725 100644 (file)
--- a/src/bin/e_test_helper.c
+++ b/src/bin/e_test_helper.c
@@ -811,7 +811,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 a18694ecbac2c4f6406e23ef2fab059b810e094a..6889eaa2dc6e32d66e5a70f602186fd79b194ca7 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 daf691aec6e28207c491c838a1ae9429ac016045..7429809b3314fd40dff3e3ae836ca515f7c7512b 100644 (file)
--- a/src/bin/services/e_service_quickpanel.c
+++ b/src/bin/services/e_service_quickpanel.c
@@ -1810,10 +1810,7 @@ e_service_quickpanel_client_set(E_Client *ec)
 
    // 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 7a3f9f13b5e79b40a1dad7fcc93596b0668ca66e..f778cb15cbf63877f9b48c4c020bc7b10af142f2 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->pixmap, 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_volume.c b/src/bin/services/e_service_volume.c
index 4c22a895e7d92026401b1662d018a34039e0ee27..25dcfdf2e909e09c58c10fe7cb650f7bbbc86220 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;