[EGIT] [core/enlightenment] master 01/01: fix client layer marker detection/usage in wayland

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=3f2efbc5485a0b4d8e67ab570db24ad76a7c22e6

commit 3f2efbc5485a0b4d8e67ab570db24ad76a7c22e6
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Wed Apr 2 11:07:22 2014 -0400

    fix client layer marker detection/usage in wayland
    
    this is the correct fix for D687
---
 src/bin/e_comp_object.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index b1832e8..1b82b9a 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -969,6 +969,9 @@ _e_comp_intercept_stack_above(void *data, Evas_Object *obj, 
Evas_Object *above)
    cw2 = evas_object_data_get(o, "comp_obj");
    while (!cw2)
      {
+        /* check for non-client layer object */
+        if (!e_util_strcmp(evas_object_name_get(o), "layer_obj"))
+          break;
         /* find an existing client to use for layering
          * by walking up the object stack
          *
@@ -1014,7 +1017,7 @@ _e_comp_intercept_stack_above(void *data, Evas_Object 
*obj, Evas_Object *above)
      }
    else
      _e_comp_object_layers_add(cw, NULL, NULL, 0);
-   if (cw->ec->new_client || (ecstack != (cw2 ? cw2->ec : NULL)))
+   if (cw->ec->new_client || (ecstack->frame != o))
      evas_object_data_set(obj, "client_restack", (void*)1);
    evas_object_stack_above(obj, above);
    if (cw->comp->layers[cw->layer].obj)
@@ -1022,7 +1025,7 @@ _e_comp_intercept_stack_above(void *data, Evas_Object 
*obj, Evas_Object *above)
        {
           CRI("STACKING ERROR!!!");
        }
-   if (cw->ec->new_client || (ecstack != (cw2 ? cw2->ec : NULL)))
+   if (cw->ec->new_client || (ecstack->frame != o))
      evas_object_data_del(obj, "client_restack");
    e_comp_shape_queue(cw->comp);
 }
@@ -1064,6 +1067,9 @@ _e_comp_intercept_stack_below(void *data, Evas_Object 
*obj, Evas_Object *below)
    cw2 = evas_object_data_get(o, "comp_obj");
    while (!cw2)
      {
+        /* check for non-client layer object */
+        if (!e_util_strcmp(evas_object_name_get(o), "layer_obj"))
+          break;
         /* find an existing client to use for layering
          * by walking up the object stack
          *
@@ -1109,7 +1115,7 @@ _e_comp_intercept_stack_below(void *data, Evas_Object 
*obj, Evas_Object *below)
      }
    else
      _e_comp_object_layers_add(cw, NULL, NULL, 0);
-   if (cw->ec->new_client || (ecstack != (cw2 ? cw2->ec : NULL)))
+   if (cw->ec->new_client || (ecstack->frame != o))
      evas_object_data_set(obj, "client_restack", (void*)1);
    evas_object_stack_below(obj, below);
    if (cw->comp->layers[cw->layer].obj)
@@ -1117,7 +1123,7 @@ _e_comp_intercept_stack_below(void *data, Evas_Object 
*obj, Evas_Object *below)
        {
           CRI("STACKING ERROR!!!");
        }
-   if (cw->ec->new_client || (ecstack != (cw2 ? cw2->ec : NULL)))
+   if (cw->ec->new_client || (ecstack->frame != o))
      evas_object_data_del(obj, "client_restack");
    e_comp_shape_queue(cw->comp);
 }

--