summaryrefslogtreecommitdiff
path: root/legacy/evas/src/lib
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2012-10-30 05:01:20 +0000
committerChunEon Park <hermet@hermet.pe.kr>2012-10-30 05:01:20 +0000
commit5661ca2a830f49b67ee46f1db41ec664decd3427 (patch)
tree53ff54ce5b9e4cd95fc52686cb768abe065dc558 /legacy/evas/src/lib
parent6efc9a7ab723fb92189e82fa54dcb1d8dd70dc38 (diff)
evas/events - fixed simple mistake
SVN revision: 78634
Diffstat (limited to 'legacy/evas/src/lib')
-rw-r--r--legacy/evas/src/lib/canvas/evas_events.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/legacy/evas/src/lib/canvas/evas_events.c
index 11b2899..f17abdb 100644
--- a/legacy/evas/src/lib/canvas/evas_events.c
+++ b/legacy/evas/src/lib/canvas/evas_events.c
@@ -228,7 +228,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
228 src->proxy.src_event_in = _evas_event_object_list_raw_in_get(eo_e, src->proxy.src_event_in, evas_object_smart_members_get_direct(eo_src), NULL, ev->canvas.x, ev->canvas.y, &no_rep, EINA_TRUE); 228 src->proxy.src_event_in = _evas_event_object_list_raw_in_get(eo_e, src->proxy.src_event_in, evas_object_smart_members_get_direct(eo_src), NULL, ev->canvas.x, ev->canvas.y, &no_rep, EINA_TRUE);
229 } 229 }
230 else 230 else
231 src->proxy.src_event_in = eina_list_append(src->proxy.src_event_in, src); 231 src->proxy.src_event_in = eina_list_append(src->proxy.src_event_in, eo_src);
232 232
233 int addgrab = 0; 233 int addgrab = 0;
234 if (e->pointer.downs > 1) addgrab = e->pointer.downs - 1; 234 if (e->pointer.downs > 1) addgrab = e->pointer.downs - 1;
@@ -774,7 +774,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
774 ins = _evas_event_object_list_raw_in_get(eo_e, ins, evas_object_smart_members_get_direct(eo_src), NULL, ev->cur.canvas.x, ev->cur.canvas.y, &no_rep, EINA_TRUE); 774 ins = _evas_event_object_list_raw_in_get(eo_e, ins, evas_object_smart_members_get_direct(eo_src), NULL, ev->cur.canvas.x, ev->cur.canvas.y, &no_rep, EINA_TRUE);
775 } 775 }
776 else 776 else
777 ins = eina_list_append(ins, src); 777 ins = eina_list_append(ins, eo_src);
778 Eina_List *copy = evas_event_list_copy(src->proxy.src_event_in); 778 Eina_List *copy = evas_event_list_copy(src->proxy.src_event_in);
779 EINA_LIST_FOREACH(copy, l, eo_child) 779 EINA_LIST_FOREACH(copy, l, eo_child)
780 { 780 {
@@ -838,15 +838,15 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_
838 838
839 ev->output.x = ev->canvas.x; 839 ev->output.x = ev->canvas.x;
840 ev->output.y = ev->canvas.y; 840 ev->output.y = ev->canvas.y;
841
842 Eina_List *ins = NULL; 841 Eina_List *ins = NULL;
843 if (src->is_smart) 842 if (src->is_smart)
844 { 843 {
845 int no_rep = 0; 844 int no_rep = 0;
846 ins = _evas_event_object_list_raw_in_get(eo_e, ins, evas_object_smart_members_get_direct(eo_src), NULL, ev->canvas.x, ev->canvas.y, &no_rep, EINA_TRUE); 845 ins = _evas_event_object_list_raw_in_get(eo_e, ins, evas_object_smart_members_get_direct(eo_src), NULL, ev->canvas.x, ev->canvas.y, &no_rep, EINA_TRUE);
846
847 } 847 }
848 else 848 else
849 ins = eina_list_append(ins, src); 849 ins = eina_list_append(ins, eo_src);
850 850
851 Evas_Coord point_x = ev->canvas.x; 851 Evas_Coord point_x = ev->canvas.x;
852 Evas_Coord point_y = ev->canvas.y; 852 Evas_Coord point_y = ev->canvas.y;
@@ -859,11 +859,13 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_
859 if (!eina_list_data_find(src->proxy.src_event_in, eo_child)) 859 if (!eina_list_data_find(src->proxy.src_event_in, eo_child))
860 { 860 {
861 if(child->mouse_in) continue; 861 if(child->mouse_in) continue;
862
862 child->mouse_in = 1; 863 child->mouse_in = 1;
863 ev->canvas.x = point_x; 864 ev->canvas.x = point_x;
864 ev->canvas.y = point_y; 865 ev->canvas.y = point_y;
865 _evas_event_framespace_adjust(eo_child, &ev->canvas.x, 866 _evas_event_framespace_adjust(eo_child, &ev->canvas.x,
866 &ev->canvas.y); 867 &ev->canvas.y);
868
867 _evas_event_havemap_adjust(eo_child, child, &ev->canvas.x, 869 _evas_event_havemap_adjust(eo_child, child, &ev->canvas.x,
868 &ev->canvas.y, 870 &ev->canvas.y,
869 child->mouse_grabbed); 871 child->mouse_grabbed);