e_comp_object: fix add/remove client to list of wrong layer 59/99359/1 accepted/tizen/3.0/common/20161124.181524 accepted/tizen/3.0/ivi/20161123.003109 accepted/tizen/3.0/mobile/20161123.003015 accepted/tizen/3.0/tv/20161123.003031 accepted/tizen/3.0/wearable/20161123.003050 accepted/tizen/common/20161122.193121 accepted/tizen/ivi/20161123.000508 accepted/tizen/mobile/20161123.000350 accepted/tizen/tv/20161123.000416 accepted/tizen/wearable/20161123.000443 submit/tizen/20161122.124549 submit/tizen_3.0/20161122.124627
authorMinJeong Kim <minjjj.kim@samsung.com>
Tue, 22 Nov 2016 12:17:50 +0000 (21:17 +0900)
committerMinJeong Kim <minjjj.kim@samsung.com>
Tue, 22 Nov 2016 12:31:04 +0000 (21:31 +0900)
Change-Id: I19e48747e93f3f7355eb550f0f02c000f7f790dc
Signed-off-by: MinJeong Kim <minjjj.kim@samsung.com>
src/bin/e_comp_object.c

index fa52a83..7cbc205 100644 (file)
@@ -4868,12 +4868,19 @@ e_comp_object_layer_update(Evas_Object *obj,
    _e_comp_object_layers_remove(cw);
    if (cw2)
      {
-        if (above)
-          _e_comp_object_layers_add(cw, cw2, NULL, 0);
-        else if (o == obj)
-          _e_comp_object_layers_add(cw, NULL, NULL, above? 0 : 1);
-        else if (below)
-          _e_comp_object_layers_add(cw, NULL, cw2, 0);
+        if (cw2->layer > cw->layer)
+          _e_comp_object_layers_add(cw, NULL, NULL, 0);
+        else if (cw2->layer == cw->layer)
+          {
+             if (above)
+               _e_comp_object_layers_add(cw, cw2, NULL, 0);
+             else if (o == obj)
+               _e_comp_object_layers_add(cw, NULL, NULL, above? 0 : 1);
+             else if (below)
+               _e_comp_object_layers_add(cw, NULL, cw2, 0);
+          }
+        else
+          _e_comp_object_layers_add(cw, NULL, NULL, 1);
      }
    else
      _e_comp_object_layers_add(cw, NULL, NULL, 0);