summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2013-12-13 09:09:56 -0500
committerMike Blumenkrantz <zmike@samsung.com>2013-12-13 09:09:56 -0500
commit7435381907d27fb853741b76fe54ab157b145df9 (patch)
tree7bf419fd46a1bb71f25f92fc925c01e17f7a3e9e
parented1a5e4bcf16cab1a2df948d04feeb990e77768d (diff)
only clip shelf object to zone if shelf is not a popupv0.18.0-rc2
T629
-rw-r--r--src/bin/e_shelf.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 440df5e..471f76c 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -278,7 +278,8 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, E
278 e_gadcon_shelf_set(es->gadcon, es); 278 e_gadcon_shelf_set(es->gadcon, es);
279 e_gadcon_xdnd_window_set(es->gadcon, e_comp_get(es)->ee_win); 279 e_gadcon_xdnd_window_set(es->gadcon, e_comp_get(es)->ee_win);
280 e_gadcon_dnd_window_set(es->gadcon, e_comp_get(es)->ee_win); 280 e_gadcon_dnd_window_set(es->gadcon, e_comp_get(es)->ee_win);
281 evas_object_clip_set(es->o_base, es->zone->bg_clip_object); 281 if (!es->popup)
282 evas_object_clip_set(es->o_base, es->zone->bg_clip_object);
282 e_gadcon_util_menu_attach_func_set(es->gadcon, 283 e_gadcon_util_menu_attach_func_set(es->gadcon,
283 _e_shelf_cb_menu_items_append, es); 284 _e_shelf_cb_menu_items_append, es);
284 285
@@ -911,7 +912,11 @@ e_shelf_style_set(E_Shelf *es, const char *style)
911 else 912 else
912 es->instant_delay = -1.0; 913 es->instant_delay = -1.0;
913 914
914 if (es->popup && (es->popup->content != es->o_base)) e_popup_content_set(es->popup, es->o_base); 915 if (es->popup && (es->popup->content != es->o_base))
916 {
917 e_popup_content_set(es->popup, es->o_base);
918 evas_object_clip_set(es->popup->cw->effect_obj, es->zone->bg_clip_object);
919 }
915} 920}
916 921
917EAPI void 922EAPI void