From 4b889b31b38a0e25c1a216c4e4fd6a7f80ad02fe Mon Sep 17 00:00:00 2001 From: MinJeong Kim Date: Tue, 7 Jul 2015 21:09:34 +0900 Subject: [PATCH] Extended scope of mananged client layer Extended scope of mananged client layer to E_LAYER_CLIENT_NOTIFICATION_HIGH. Change-Id: I8dae90d02a060bf57d9f2105522386c3ce370463 Signed-off-by: MinJeong Kim --- src/bin/e_client.c | 8 ++++---- src/bin/e_comp_canvas.c | 2 +- src/bin/e_comp_x.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index a278ff29f8..6b271a197a 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -3345,11 +3345,11 @@ e_client_above_get(const E_Client *ec) if (!e_object_is_del(E_OBJECT(ec2))) return ec2; } - if (ec->layer == E_LAYER_CLIENT_PRIO) return NULL; + if (ec->layer == E_LAYER_CLIENT_NOTIFICATION_HIGH) return NULL; if (e_comp_canvas_client_layer_map(ec->layer) == 9999) return NULL; /* go up the layers until we find one */ - for (x = e_comp_canvas_layer_map(ec->layer) + 1; x <= e_comp_canvas_layer_map(E_LAYER_CLIENT_PRIO); x++) + for (x = e_comp_canvas_layer_map(ec->layer) + 1; x <= e_comp_canvas_layer_map(E_LAYER_CLIENT_NOTIFICATION_HIGH); x++) { if (!ec->comp->layers[x].clients) continue; EINA_INLIST_FOREACH(ec->comp->layers[x].clients, ec2) @@ -3400,7 +3400,7 @@ e_client_bottom_get(const E_Comp *c) EINA_SAFETY_ON_NULL_RETURN_VAL(c, NULL); - for (x = e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); x <= e_comp_canvas_layer_map(E_LAYER_CLIENT_PRIO); x++) + for (x = e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); x <= e_comp_canvas_layer_map(E_LAYER_CLIENT_NOTIFICATION_HIGH); x++) { E_Client *ec2; @@ -3419,7 +3419,7 @@ e_client_top_get(const E_Comp *c) EINA_SAFETY_ON_NULL_RETURN_VAL(c, NULL); - for (x = e_comp_canvas_layer_map(E_LAYER_CLIENT_PRIO); x >= e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); x--) + for (x = e_comp_canvas_layer_map(E_LAYER_CLIENT_NOTIFICATION_HIGH); x >= e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); x--) { E_Client *ec2; diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c index ca044bfcbf..8cf34c6364 100644 --- a/src/bin/e_comp_canvas.c +++ b/src/bin/e_comp_canvas.c @@ -478,7 +478,7 @@ e_comp_canvas_fake_layers_init(E_Comp *comp) unsigned int layer; /* init layers */ - for (layer = e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); layer <= e_comp_canvas_layer_map(E_LAYER_CLIENT_PRIO); layer++) + for (layer = e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); layer <= e_comp_canvas_layer_map(E_LAYER_CLIENT_NOTIFICATION_HIGH); layer++) { Evas_Object *o2; diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index ae946d9ac9..32122e447e 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -4772,7 +4772,7 @@ _e_comp_x_del(E_Comp *c) ecore_x_ungrab(); } - for (i = e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); i <= e_comp_canvas_layer_map(E_LAYER_CLIENT_PRIO); i++) + for (i = e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); i <= e_comp_canvas_layer_map(E_LAYER_CLIENT_NOTIFICATION_HIGH); i++) ecore_x_window_free(c->layers[i].win); ecore_x_composite_unredirect_subwindows @@ -5170,7 +5170,7 @@ _e_comp_x_setup(E_Comp *c, Ecore_X_Window root, int w, int h) e_grabinput_focus(c->ee_win, E_FOCUS_METHOD_PASSIVE); /* init layers */ - for (i = e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); i <= e_comp_canvas_layer_map(E_LAYER_CLIENT_PRIO); i++) + for (i = e_comp_canvas_layer_map(E_LAYER_CLIENT_DESKTOP); i <= e_comp_canvas_layer_map(E_LAYER_CLIENT_NOTIFICATION_HIGH); i++) { char buf[64]; E_Client *ec; -- 2.34.1