jpeg pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=4ee5f05982d6096c697c12710f96c4ab05e7f9ee
commit 4ee5f05982d6096c697c12710f96c4ab05e7f9ee Author: Jean-Philippe Andre <[email protected]> Date: Tue Jul 4 15:00:16 2017 +0900 Revert "menu: hide by default until we can fix elm menu calcs" This reverts commit 863b3d7ab3e0356fcb17e8b1254f3d9c8d38ee96. --- src/bin/edi_main.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c index 02d8d45..2939592 100644 --- a/src/bin/edi_main.c +++ b/src/bin/edi_main.c @@ -1336,25 +1336,6 @@ _win_delete_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event edi_close(); } -static void -_win_cb_key_down(void *data, Evas *e EINA_UNUSED, - Evas_Object *obj EINA_UNUSED, void *event) -{ - Eina_Bool ctrl, alt, shift; - Evas_Event_Key_Down *ev = event; - Evas_Object *win = data; - - ctrl = evas_key_modifier_is_set(ev->modifiers, "Ctrl"); - alt = evas_key_modifier_is_set(ev->modifiers, "Alt"); - shift = evas_key_modifier_is_set(ev->modifiers, "Shift"); - - if (!ctrl && alt && !shift) - { - if (!strcmp(ev->key, "f")) - _edi_menu_setup(win); - } -} - Eina_Bool edi_open(const char *inputpath) { @@ -1401,6 +1382,8 @@ 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); @@ -1423,9 +1406,6 @@ edi_open(const char *inputpath) ecore_event_handler_add(EDI_EVENT_FILE_CHANGED, _edi_file_changed, NULL); ecore_event_handler_add(EDI_EVENT_FILE_SAVED, _edi_file_saved, NULL); - evas_object_event_callback_add(win, EVAS_CALLBACK_KEY_DOWN, - _win_cb_key_down, win); - free(path); return EINA_TRUE; } --
