summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrii Kroitor <an.kroitor@samsung.com>2014-09-24 11:42:26 +0200
committerCedric BAIL <cedric@osg.samsung.com>2014-09-24 11:43:37 +0200
commitadff9e013d32df52f78b807a7e2ac5351dad899d (patch)
treecab7ec12b9cf2cd538400086915e228720afae13
parentcc1a5149feb2b7422209cf2aecad82e0d1813dc3 (diff)
evas_events: fixed keyup with modifier
Summary: removed check that disallows exact modifiers set. I.e. if we need Ctrl+s without any other modifiers: mask = evas_key_modifier_mask_get(obj, "Control"); evas_object_key_grab(obj, "o", mask, ~mask, false); This works with keydown, but was broken with keyup. Reviewers: cedric, seoz, Hermet, raster Subscribers: cedric, reutskiy.v.v Differential Revision: https://phab.enlightenment.org/D1474 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com> Signed-off-by: Carsten Haitzler (Rasterman) <raster@rasterman.com>
-rw-r--r--src/lib/evas/canvas/evas_events.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 38f0e8dc50..f5f7ba78f2 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -2596,8 +2596,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
2596 if (!g->object) continue; 2596 if (!g->object) continue;
2597 if (((e->modifiers.mask & g->modifiers) || 2597 if (((e->modifiers.mask & g->modifiers) ||
2598 (g->modifiers == e->modifiers.mask)) && 2598 (g->modifiers == e->modifiers.mask)) &&
2599 (!((e->modifiers.mask & g->not_modifiers) || 2599 (!(e->modifiers.mask & g->not_modifiers)) &&
2600 (g->not_modifiers == ~e->modifiers.mask))) &&
2601 (!strcmp(keyname, g->keyname))) 2600 (!strcmp(keyname, g->keyname)))
2602 { 2601 {
2603 Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS); 2602 Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS);