[EGIT] [tools/edi] master 01/01: EDI -> Main Menu -> Open Project (No tabs) -> Dancing window on Start Weirdness Fix

[Al Poole]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=e3459cb5261ebb553ea991efc564bd1df3bc0f98

commit e3459cb5261ebb553ea991efc564bd1df3bc0f98
Author: Al Poole <nets...@gmail.com>
Date:   Sat Apr 8 18:24:11 2017 +0100

    EDI -> Main Menu -> Open Project (No tabs) -> Dancing window on Start 
Weirdness Fix
    
    Reviewers: ajwillia.ms
    
    Reviewed By: ajwillia.ms
    
    Differential Revision: https://phab.enlightenment.org/D4778
---
 src/bin/edi_main.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index 1fab8bd..9e8adeb 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -872,13 +872,11 @@ _edi_menu_about_cb(void *data EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED,
 }
 
 static void
-_edi_menu_setup(Evas_Object *win)
+_edi_menu_setup(Evas_Object *obj)
 {
-   Evas_Object *menu;
+   Evas_Object *menu = obj;
    Elm_Object_Item *menu_it;
 
-   menu = elm_win_main_menu_get(win);
-
    menu_it = elm_menu_item_add(menu, NULL, NULL, "File", NULL, NULL);
    elm_menu_item_add(menu, menu_it, "folder-new", "New Project ...", 
_edi_menu_project_new_cb, NULL);
    elm_menu_item_separator_add(menu, menu_it);
@@ -1113,7 +1111,7 @@ _edi_open_tabs()
 Eina_Bool
 edi_open(const char *inputpath)
 {
-   Evas_Object *win, *hbx, *vbx, *tb, *content;
+   Evas_Object *win, *hbx, *vbx, *tb, *content, *menu, *menu_box;
    const char *winname;
    char *path;
 
@@ -1133,6 +1131,20 @@ edi_open(const char *inputpath)
    free((char*)winname);
    if (!win) return EINA_FALSE;
 
+   menu_box = elm_box_add(win);
+   elm_box_horizontal_set(menu_box, EINA_TRUE);
+   evas_object_size_hint_weight_set(menu_box, EVAS_HINT_EXPAND, 
EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(menu_box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_win_resize_object_add(win, menu_box);
+   evas_object_show(menu_box);
+
+   menu = elm_win_main_menu_get(win);
+   _edi_menu_setup(menu);
+   evas_object_size_hint_weight_set(menu, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(menu, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_show(menu);
+   elm_box_pack_end(menu_box, menu);
+
    _edi_main_win = win;
    elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
    evas_object_smart_callback_add(win, "delete,request", _edi_exit, NULL);
@@ -1156,8 +1168,6 @@ edi_open(const char *inputpath)
    elm_box_pack_end(hbx, vbx);
    evas_object_show(vbx);
 
-   _edi_menu_setup(win);
-
    content = edi_content_setup(vbx, path);
    evas_object_size_hint_weight_set(content, EVAS_HINT_EXPAND, 
EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(content, EVAS_HINT_FILL, EVAS_HINT_FILL);

--