vtorri
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "menu: hide by default until we can fix elm menu calcs" 

This reverts commit 863b3d7ab3.
This commit is contained in:
Jean-Philippe Andre 2017-07-04 15:00:16 +09:00
parent 2924b323f6
commit 4ee5f05982
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/bin/edi_main.c
View File

@ -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;
}