hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=8c7197e7f304dc367a0792e7c4b7f93d3036bdd8
commit 8c7197e7f304dc367a0792e7c4b7f93d3036bdd8 Author: ChunEon Park <[email protected]> Date: Sat Nov 1 17:20:33 2014 +0900 app/main: adjust key handle priority. prevent any short key functions if a popup is opened. --- src/bin/main.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/bin/main.c b/src/bin/main.c index b1e8952..165db4e 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -640,19 +640,6 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void *ev) Ecore_Event_Key *event = ev; app_data *ad = data; - //Shift Key - if (!strcmp("Shift_L", event->key)) - { - ad->shift_pressed = EINA_TRUE; - return ECORE_CALLBACK_DONE; - } - - if (ad->ctrl_pressed) - { - if (ad->shift_pressed) return template_insert_patch(ad, event->key); - else return ctrl_func(ad, event->key); - } - //Main Menu if (!strcmp(event->key, "Escape")) { @@ -676,6 +663,19 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void *ev) if (menu_activated_get() > 0) return ECORE_CALLBACK_PASS_ON; if (file_mgr_warning_is_opened()) return ECORE_CALLBACK_PASS_ON; + //Shift Key + if (!strcmp("Shift_L", event->key)) + { + ad->shift_pressed = EINA_TRUE; + return ECORE_CALLBACK_DONE; + } + + if (ad->ctrl_pressed) + { + if (ad->shift_pressed) return template_insert_patch(ad, event->key); + else return ctrl_func(ad, event->key); + } + //Control Key if (!strcmp("Control_L", event->key)) { --
