diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2013-12-13 09:09:56 -0500 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2013-12-13 09:09:56 -0500 |
| commit | 7435381907d27fb853741b76fe54ab157b145df9 (patch) | |
| tree | 7bf419fd46a1bb71f25f92fc925c01e17f7a3e9e | |
| parent | ed1a5e4bcf16cab1a2df948d04feeb990e77768d (diff) | |
| download | enlightenment-0.18.0-rc2.tar.gz | |
only clip shelf object to zone if shelf is not a popupv0.18.0-rc2
T629
| -rw-r--r-- | src/bin/e_shelf.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c index 440df5e91e..471f76c72c 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 e_gadcon_shelf_set(es->gadcon, es); e_gadcon_xdnd_window_set(es->gadcon, e_comp_get(es)->ee_win); e_gadcon_dnd_window_set(es->gadcon, e_comp_get(es)->ee_win); - evas_object_clip_set(es->o_base, es->zone->bg_clip_object); + if (!es->popup) + evas_object_clip_set(es->o_base, es->zone->bg_clip_object); e_gadcon_util_menu_attach_func_set(es->gadcon, _e_shelf_cb_menu_items_append, es); @@ -911,7 +912,11 @@ e_shelf_style_set(E_Shelf *es, const char *style) else es->instant_delay = -1.0; - if (es->popup && (es->popup->content != es->o_base)) e_popup_content_set(es->popup, es->o_base); + if (es->popup && (es->popup->content != es->o_base)) + { + e_popup_content_set(es->popup, es->o_base); + evas_object_clip_set(es->popup->cw->effect_obj, es->zone->bg_clip_object); + } } EAPI void |