summaryrefslogtreecommitdiff
path: root/legacy/evas/src/lib
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2012-10-22 06:45:15 +0000
committerChunEon Park <hermet@hermet.pe.kr>2012-10-22 06:45:15 +0000
commit32e089629e6a33434dcbbaeebda1d11be36e70e7 (patch)
treef022226212c39da5f923bdda651769be64dcb48f /legacy/evas/src/lib
parent533cb57962eb389f1c203bd1ec996cb016efdba5 (diff)
evas/event - my commit caused some problem. revert temporarly.
SVN revision: 78316
Diffstat (limited to 'legacy/evas/src/lib')
-rw-r--r--legacy/evas/src/lib/canvas/evas_events.c12
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_smart.c11
2 files changed, 9 insertions, 14 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/legacy/evas/src/lib/canvas/evas_events.c
index a41f5e3..168e8c8 100644
--- a/legacy/evas/src/lib/canvas/evas_events.c
+++ b/legacy/evas/src/lib/canvas/evas_events.c
@@ -60,7 +60,7 @@ _evas_event_object_list_raw_in_get(Evas *eo_e, Eina_List *in,
60 return in; 60 return in;
61 } 61 }
62 if (evas_event_passes_through(eo_obj, obj)) continue; 62 if (evas_event_passes_through(eo_obj, obj)) continue;
63 if (evas_object_is_source_invisible(eo_obj, obj)) continue; 63 //if (evas_object_is_source_invisible(eo_obj, obj)) continue;
64 if ((obj->cur.visible) && (obj->delete_me == 0) && 64 if ((obj->cur.visible) && (obj->delete_me == 0) &&
65 (!obj->clip.clipees) && 65 (!obj->clip.clipees) &&
66 (evas_object_clippers_is_visible(eo_obj, obj))) 66 (evas_object_clippers_is_visible(eo_obj, obj)))
@@ -828,7 +828,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
828 obj->mouse_grabbed) && 828 obj->mouse_grabbed) &&
829 (!evas_event_passes_through(eo_obj, obj)) && 829 (!evas_event_passes_through(eo_obj, obj)) &&
830 (!evas_event_freezes_through(eo_obj, obj)) && 830 (!evas_event_freezes_through(eo_obj, obj)) &&
831 (!evas_object_is_source_invisible(eo_obj, obj)) && 831// (!evas_object_is_source_invisible(eo_obj, obj)) &&
832 (!obj->clip.clipees)) 832 (!obj->clip.clipees))
833 { 833 {
834 if ((px != x) || (py != y)) 834 if ((px != x) || (py != y))
@@ -970,7 +970,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
970 eina_list_data_find(ins, eo_obj) && 970 eina_list_data_find(ins, eo_obj) &&
971 (!evas_event_passes_through(eo_obj, obj)) && 971 (!evas_event_passes_through(eo_obj, obj)) &&
972 (!evas_event_freezes_through(eo_obj, obj)) && 972 (!evas_event_freezes_through(eo_obj, obj)) &&
973 (!evas_object_is_source_invisible(eo_obj, obj)) && 973 //(!evas_object_is_source_invisible(eo_obj, obj)) &&
974 (!obj->clip.clipees) && 974 (!obj->clip.clipees) &&
975 ((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y)) 975 ((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y))
976 ) 976 )
@@ -1144,7 +1144,7 @@ nogrep:
1144 eina_list_data_find(newin, eo_obj) && 1144 eina_list_data_find(newin, eo_obj) &&
1145 (!evas_event_passes_through(eo_obj, obj)) && 1145 (!evas_event_passes_through(eo_obj, obj)) &&
1146 (!evas_event_freezes_through(eo_obj, obj)) && 1146 (!evas_event_freezes_through(eo_obj, obj)) &&
1147 (!evas_object_is_source_invisible(eo_obj, obj)) && 1147 //(!evas_object_is_source_invisible(eo_obj, obj)) &&
1148 (!obj->clip.clipees) && 1148 (!obj->clip.clipees) &&
1149 ((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y)) 1149 ((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y))
1150 ) 1150 )
@@ -1662,7 +1662,7 @@ _canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list)
1662 obj->mouse_grabbed) && 1662 obj->mouse_grabbed) &&
1663 (!evas_event_passes_through(eo_obj, obj)) && 1663 (!evas_event_passes_through(eo_obj, obj)) &&
1664 (!evas_event_freezes_through(eo_obj, obj)) && 1664 (!evas_event_freezes_through(eo_obj, obj)) &&
1665 (!evas_object_is_source_invisible(eo_obj, obj)) && 1665 //(!evas_object_is_source_invisible(eo_obj, obj)) &&
1666 (!obj->clip.clipees)) 1666 (!obj->clip.clipees))
1667 { 1667 {
1668 ev.cur.canvas.x = x; 1668 ev.cur.canvas.x = x;
@@ -1731,7 +1731,7 @@ _canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list)
1731 eina_list_data_find(ins, eo_obj) && 1731 eina_list_data_find(ins, eo_obj) &&
1732 (!evas_event_passes_through(eo_obj, obj)) && 1732 (!evas_event_passes_through(eo_obj, obj)) &&
1733 (!evas_event_freezes_through(eo_obj, obj)) && 1733 (!evas_event_freezes_through(eo_obj, obj)) &&
1734 (!evas_object_is_source_invisible(eo_obj, obj)) && 1734// (!evas_object_is_source_invisible(eo_obj, obj)) &&
1735 (!obj->clip.clipees) && 1735 (!obj->clip.clipees) &&
1736 ((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y)) 1736 ((!obj->precise_is_inside) || evas_object_is_inside(eo_obj, obj, x, y))
1737 ) 1737 )
diff --git a/legacy/evas/src/lib/canvas/evas_object_smart.c b/legacy/evas/src/lib/canvas/evas_object_smart.c
index a1600cb..afcbd36 100644
--- a/legacy/evas/src/lib/canvas/evas_object_smart.c
+++ b/legacy/evas/src/lib/canvas/evas_object_smart.c
@@ -1330,8 +1330,6 @@ evas_object_smart_render(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_
1330static void 1330static void
1331evas_object_smart_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) 1331evas_object_smart_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
1332{ 1332{
1333 Evas_Public_Data *e;
1334
1335 if (obj->pre_render_done) return; 1333 if (obj->pre_render_done) return;
1336 if (!obj->child_has_map && !obj->cur.cached_surface) 1334 if (!obj->child_has_map && !obj->cur.cached_surface)
1337 { 1335 {
@@ -1405,12 +1403,9 @@ evas_object_smart_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
1405#endif 1403#endif
1406 } 1404 }
1407 1405
1408 e = obj->layer->evas; 1406 if (obj->changed_map || obj->changed_source_visible)
1409 1407 evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes,
1410 if (obj->changed_map) 1408 eo_obj, obj);
1411 {
1412 evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj);
1413 }
1414 1409
1415 obj->pre_render_done = EINA_TRUE; 1410 obj->pre_render_done = EINA_TRUE;
1416} 1411}