summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-11-03 12:53:27 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-11-18 11:43:10 -0500
commitb858cf7b730529a39fbc8b6d3072e75b8e8a0b20 (patch)
treee6ff1b1166ffeef9412f4e0c576c4a4b0a80a06b
parent0bf3a3d3657c19293f8bb51a68823b63563878dd (diff)
move bryces to E_LAYER_DESKTOP_TOP when not above windows
moderately sure this won't conflict with anything important... fix T4819
-rw-r--r--src/bin/e_bryce.c4
-rw-r--r--src/bin/e_bryce_editor.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/e_bryce.c b/src/bin/e_bryce.c
index 6ef714e6d..bb8e205f7 100644
--- a/src/bin/e_bryce.c
+++ b/src/bin/e_bryce.c
@@ -369,7 +369,7 @@ _bryce_site_hints(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event
369static E_Comp_Object_Type 369static E_Comp_Object_Type
370_bryce_shadow_type(const Bryce *b) 370_bryce_shadow_type(const Bryce *b)
371{ 371{
372 if ((b->layer == E_LAYER_DESKTOP) || b->noshadow) 372 if ((b->layer == E_LAYER_DESKTOP_TOP) || b->noshadow)
373 return E_COMP_OBJECT_TYPE_NONE; 373 return E_COMP_OBJECT_TYPE_NONE;
374 return E_COMP_OBJECT_TYPE_POPUP; 374 return E_COMP_OBJECT_TYPE_POPUP;
375} 375}
@@ -1280,7 +1280,7 @@ e_bryce_init(void)
1280 } 1280 }
1281 b->version = bryce_version; 1281 b->version = bryce_version;
1282 if (!e_comp_zone_number_get(b->zone)) continue; 1282 if (!e_comp_zone_number_get(b->zone)) continue;
1283 b->layer = E_CLAMP(b->layer, E_LAYER_DESKTOP, E_LAYER_CLIENT_ABOVE); 1283 b->layer = E_CLAMP(b->layer, E_LAYER_DESKTOP_TOP, E_LAYER_CLIENT_ABOVE);
1284 _bryce_create(b, e_comp->elm); 1284 _bryce_create(b, e_comp->elm);
1285 evas_object_show(b->bryce); 1285 evas_object_show(b->bryce);
1286 } 1286 }
diff --git a/src/bin/e_bryce_editor.c b/src/bin/e_bryce_editor.c
index 8406f2c32..9592b6e07 100644
--- a/src/bin/e_bryce_editor.c
+++ b/src/bin/e_bryce_editor.c
@@ -105,7 +105,7 @@ _editor_bryce_add(Evas_Object *obj)
105 e_bryce_style_set(b, bi->style); 105 e_bryce_style_set(b, bi->style);
106 e_bryce_autohide_set(b, bi->autohide); 106 e_bryce_autohide_set(b, bi->autohide);
107 e_bryce_autosize_set(b, bi->autosize); 107 e_bryce_autosize_set(b, bi->autosize);
108 evas_object_layer_set(b, bi->stack_under ? E_LAYER_DESKTOP : E_LAYER_CLIENT_ABOVE); 108 evas_object_layer_set(b, bi->stack_under ? E_LAYER_DESKTOP_TOP : E_LAYER_CLIENT_ABOVE);
109 evas_object_del(obj); 109 evas_object_del(obj);
110} 110}
111 111
@@ -194,7 +194,7 @@ _editor_style_click(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *eve
194 evas_object_smart_callback_add(ck, "changed", _editor_stacking, bi); 194 evas_object_smart_callback_add(ck, "changed", _editor_stacking, bi);
195 if (bryce) 195 if (bryce)
196 { 196 {
197 bi->stack_under = evas_object_layer_get(bryce) == E_LAYER_DESKTOP; 197 bi->stack_under = evas_object_layer_get(bryce) == E_LAYER_DESKTOP_TOP;
198 elm_check_state_set(ck, bi->stack_under); 198 elm_check_state_set(ck, bi->stack_under);
199 } 199 }
200 elm_box_pack_end(box, ck); 200 elm_box_pack_end(box, ck);