[EGIT] [core/efl] master 01/01: evas_events: fix wrong condition of proxy event behavior.

[Hosang Kim]

hermet pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=6e49a94c0e20a22866550c5f187cdd6ec32642f8

commit 6e49a94c0e20a22866550c5f187cdd6ec32642f8
Author: Hosang Kim <hosang12....@samsung.com>
Date:   Fri Dec 6 10:21:35 2019 +0900

    evas_events: fix wrong condition of proxy event behavior.
    
    Summary:
    If source_events is false, Evas object doesn't repeat events to source.
    But events is always repeated to source in multi touch case.
    
    Reviewers: Hermet, raster, cedric
    
    Reviewed By: Hermet
    
    Subscribers: #reviewers, #committers
    
    Tags: #efl
    
    Differential Revision: https://phab.enlightenment.org/D10807
---
 src/lib/evas/canvas/evas_events.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/evas/canvas/evas_events.c 
b/src/lib/evas/canvas/evas_events.c
index bb8c9346fb..12b38f1621 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -3042,7 +3042,7 @@ _canvas_event_feed_multi_down_internal(Evas_Public_Data 
*e, Efl_Input_Pointer_Da
 
         evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MULTI_DOWN, 
evt,
                                         event_id, EFL_EVENT_FINGER_DOWN);
-        if ((obj->proxy->is_proxy) || (obj->proxy->src_events))
+        if ((obj->proxy->is_proxy) && (obj->proxy->src_events))
           _evas_event_source_multi_down_events(obj, e, evt, pdata, event_id);
         if (e->delete_me || e->is_frozen) break;
      }
@@ -3126,7 +3126,7 @@ _canvas_event_feed_multi_up_internal(Evas_Public_Data *e, 
Efl_Input_Pointer_Data
           }
         evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MULTI_UP, 
evt,
                                         event_id, EFL_EVENT_FINGER_UP);
-        if ((obj->proxy->is_proxy) || (obj->proxy->src_events))
+        if ((obj->proxy->is_proxy) && (obj->proxy->src_events))
           _evas_event_source_multi_up_events(obj, e, evt, pdata, event_id);
         if (e->delete_me || e->is_frozen) break;
      }
@@ -3308,7 +3308,7 @@ _canvas_event_feed_multi_move_internal(Evas_Public_Data 
*e, Efl_Input_Pointer_Da
                   _evas_event_havemap_adjust_f(obj, &ev->cur, &ev->prev, 
obj_pdata->mouse_grabbed);
                   evas_object_event_callback_call(eo_obj, obj, 
EVAS_CALLBACK_MULTI_MOVE, evt,
                                                   event_id, 
EFL_EVENT_FINGER_MOVE);
-                  if ((obj->proxy->is_proxy) || (obj->proxy->src_events))
+                  if ((obj->proxy->is_proxy) && (obj->proxy->src_events))
                     _evas_event_source_multi_move_events(obj, e, evt, pdata, 
event_id);
 
                   if (e->delete_me || e->is_frozen) break;
@@ -3352,7 +3352,7 @@ _canvas_event_feed_multi_move_internal(Evas_Public_Data 
*e, Efl_Input_Pointer_Da
                {
                   evas_object_event_callback_call(eo_obj, obj, 
EVAS_CALLBACK_MULTI_MOVE, evt,
                                                   event_id, 
EFL_EVENT_FINGER_MOVE);
-                  if ((obj->proxy->is_proxy) || (obj->proxy->src_events))
+                  if ((obj->proxy->is_proxy) && (obj->proxy->src_events))
                     _evas_event_source_multi_move_events(obj, e, evt, pdata, 
event_id);
                }
              if (e->delete_me || e->is_frozen) break;

--