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

refactor key event method 

Summary: The key event work well now.

Test Plan:
1. Run enventor
2. Test the shortcut key that use modifiers(<Ctrl>, <Alt>)
3. Check the shortcut work correctly

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Maniphest Tasks: T5146

Differential Revision: https://phab.enlightenment.org/D4620
This commit is contained in:
YeongJong Lee 2017-02-22 15:57:17 +09:00 committed by Jaehyun Cho
parent 324454b3cb
commit a8a14566c7
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/main.c
View File

@ -631,8 +631,7 @@ enventor_setup(app_data *ad)
static Eina_Bool static Eina_Bool
alt_func(Evas_Event_Key_Down *event) alt_func(Evas_Event_Key_Down *event)
{ {
if (evas_key_modifier_is_set(event->modifiers, "Shift") || if (!evas_key_modifier_is_set(event->modifiers, "Alt"))
evas_key_modifier_is_set(event->modifiers, "Ctrl"))
return EINA_FALSE; return EINA_FALSE;
//Full Edit View //Full Edit View
@ -666,8 +665,7 @@ alt_func(Evas_Event_Key_Down *event)
static Eina_Bool static Eina_Bool
ctrl_func(Evas_Event_Key_Down *event) ctrl_func(Evas_Event_Key_Down *event)
{ {
if (evas_key_modifier_is_set(event->modifiers, "Shift") || if (!evas_key_modifier_is_set(event->modifiers, "Control"))
evas_key_modifier_is_set(event->modifiers, "Alt"))
return EINA_FALSE; return EINA_FALSE;
//Save //Save
@ -862,7 +860,7 @@ static void
keygrabber_init(app_data *ad) keygrabber_init(app_data *ad)
{ {
Evas *e = evas_object_evas_get(base_enventor_get()); Evas *e = evas_object_evas_get(base_enventor_get());
ad->keygrabber = evas_object_rectangle_add(e); ad->keygrabber = base_enventor_get();
evas_object_event_callback_add(ad->keygrabber, EVAS_CALLBACK_KEY_DOWN, evas_object_event_callback_add(ad->keygrabber, EVAS_CALLBACK_KEY_DOWN,
keygrabber_key_down_cb, NULL); keygrabber_key_down_cb, NULL);
#define GRAB_ADD(key, modifier) \ #define GRAB_ADD(key, modifier) \