devilhorns pushed a commit to branch master.

http://git.enlightenment.org/apps/express.git/commit/?id=7e420f44ec14a3baf0104ee489f734c0ed0eb5e4

commit 7e420f44ec14a3baf0104ee489f734c0ed0eb5e4
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Mon Oct 26 11:13:36 2015 -0400

    express: Fix adding conformant widget
    
    Summary: This fixes an issue where the elm_conformant widget was not
    being added to the proper evas object
    
    @fix
    
    Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
 src/bin/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/window.c b/src/bin/window.c
index 856f381..a4e2ebe 100644
--- a/src/bin/window.c
+++ b/src/bin/window.c
@@ -376,7 +376,7 @@ _window_create(void)
    evas_object_show(_win->o_bg);
 
    /* add a conformant here */
-   _win->o_conform = elm_conformant_add(_win->evas);
+   _win->o_conform = elm_conformant_add(_win->o_win);
    WEIGHT_SET(_win->o_conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    FILL_SET(_win->o_conform, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_win_resize_object_add(_win->o_win, _win->o_conform);

-- 


Reply via email to