summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Guyomarc'h <jean.guyomarch@openwide.fr>2015-10-13 17:12:53 +0200
committerNicolas Aguirre <aguirre.nicolas@gmail.com>2015-11-10 08:32:49 +0100
commita439f71965db5eb8af558086d8f38a430709c94f (patch)
treee446accb4a7f632457afe46a1441359feddf515e
parentf1679e259a2497a3b6ef7ae04ff51688061b3f98 (diff)
downloadefl-a439f71965db5eb8af558086d8f38a430709c94f.tar.gz
ecore_evas_cocoa: focus: handle ignore_events
-rw-r--r--src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c22
1 files changed, 2 insertions, 20 deletions
diff --git a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
index ff9712d126..4e6cecfb15 100644
--- a/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
+++ b/src/modules/ecore_evas/engines/cocoa/ecore_evas_cocoa.c
@@ -183,18 +183,9 @@ _ecore_evas_cocoa_event_got_focus(void *data EINA_UNUSED, int type EINA_UNUSED,
Ecore_Cocoa_Event_Window *e = event;
Ecore_Evas *ee;
- DBG("");
-
- if (!e->wid)
- return ECORE_CALLBACK_PASS_ON;
-
ee = _ecore_evas_cocoa_match(e->wid);
+ if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
- if (!ee)
- {
- ERR("Unregistered Ecore_Evas for window Id %p", e->wid);
- return ECORE_CALLBACK_PASS_ON;
- }
ee->prop.focused = EINA_TRUE;
evas_focus_in(ee->evas);
if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
@@ -208,18 +199,9 @@ _ecore_evas_cocoa_event_lost_focus(void *data EINA_UNUSED, int type EINA_UNUSED,
Ecore_Cocoa_Event_Window *e = event;
Ecore_Evas *ee;
- DBG("");
-
- if (!e->wid)
- return ECORE_CALLBACK_PASS_ON;
-
ee = _ecore_evas_cocoa_match(e->wid);
+ if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
- if (!ee)
- {
- ERR("Unregistered Ecore_Evas for window Id %p", e->wid);
- return ECORE_CALLBACK_PASS_ON;
- }
evas_focus_out(ee->evas);
ee->prop.focused = EINA_FALSE;
if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);