diff options
author | Chris Michael <cp.michael@samsung.com> | 2015-10-21 10:26:18 -0400 |
---|---|---|
committer | Chris Michael <cp.michael@samsung.com> | 2015-10-21 10:26:18 -0400 |
commit | 7b79e03937b1a5fda9e0c6aa5bbaeced0d35cf98 (patch) | |
tree | 4b48889ce5f3cbb74ccce694d7263c27d7cad8ef | |
parent | e931e86161d7f419e44652b533fea4dc9b16241b (diff) | |
download | enlightenment-7b79e03937b1a5fda9e0c6aa5bbaeced0d35cf98.tar.gz |
Fix e_menu trying to swallow an object from a different canvas
_e_menu_realize was trying to swallow the menu->container_object into
the menu->bg_object, but the menu->bg_object was being created on the
compositor canvas, and the container object was being created on the
e_comp->elm_win.
With recent EFL changes, this causes an abort inside Evas.
To fix this, set the menu->evas to be the Evas from the e_comp->elm_win.
Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r-- | src/bin/e_menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index e6f81be75f..6410b0ee57 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -1608,7 +1608,7 @@ _e_menu_realize(E_Menu *m) if (m->parent_item && m->parent_item->menu) m->zone = m->parent_item->menu->zone; if (!m->zone) return; //menu not ready! - m->evas = e_comp->evas; + m->evas = evas_object_evas_get(e_comp->elm); evas_event_freeze(m->evas); o = edje_object_add(m->evas); |