e_zone: use the e_zone_is_displaying function

instead of zone->display_state

Change-Id: I045cc114bfdbc8cc415de87cc0add421eb2767df

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 0713852..fc83c80 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -3418,7 +3418,7 @@ _e_client_visibility_zone_calculate(E_Zone *zone)
    t = eina_tiler_new(zone->w + zone->x + edge, zone->h + zone->y + edge);
    eina_tiler_tile_size_set(t, 1, 1);
 
-   if (zone->display_state != E_ZONE_DISPLAY_STATE_OFF)
+   if (e_zone_is_displaying(zone))
      {
         EINA_RECTANGLE_SET(&r, zone->x, zone->y, zone->w, zone->h);
         eina_tiler_rect_add(t, &r);
@@ -3753,7 +3753,7 @@ _e_client_focus_calculate(E_Zone *zone)
    Eina_Bool child_deferred;
 
    EINA_SAFETY_ON_NULL_RETURN(zone);
-   if (zone->display_state == E_ZONE_DISPLAY_STATE_OFF) return;
+   if (!e_zone_is_displaying(zone)) return;
 
    if (e_config->focus_policy_ext == E_FOCUS_EXT_TOP_STACK)
      {

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index b75e551..93e2e11 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2594,7 +2594,7 @@ _e_comp_wl_cb_zone_display_state_change(void *d EINA_UNUSED, int t EINA_UNUSED,
    E_OBJECT_CHECK_RETURN(zone, ECORE_CALLBACK_PASS_ON);
    E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, ECORE_CALLBACK_PASS_ON);
 
-   if (zone->display_state == E_ZONE_DISPLAY_STATE_OFF)
+   if (!e_zone_is_displaying(zone))
      _e_comp_wl_touch_cancel();
 
    return ECORE_CALLBACK_PASS_ON;