summaryrefslogtreecommitdiff
path: root/legacy/evas/src/lib
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2012-10-22 08:57:08 +0000
committerDaniel Zaoui <daniel.zaoui@yahoo.com>2012-10-22 08:57:08 +0000
commit9cc4d3c3c03e310a34ec9f429460be80cb756c85 (patch)
tree0cd3fee8a47021341802a7954209aeafca14ef3d /legacy/evas/src/lib
parentb80146d11be8876498ff1c45f7004890ffebd27f (diff)
Fix for Clouseau. Seems that some bugs remain on Evas.
Sorry for the inconvenience. Signed-off-by: Daniel Zaoui <daniel.zaoui@samsung.com> SVN revision: 78323
Diffstat (limited to 'legacy/evas/src/lib')
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/legacy/evas/src/lib/canvas/evas_object_main.c
index 8666760..73e49fe 100644
--- a/legacy/evas/src/lib/canvas/evas_object_main.c
+++ b/legacy/evas/src/lib/canvas/evas_object_main.c
@@ -529,7 +529,7 @@ _destructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
529 if (obj->mouse_grabbed > 0) 529 if (obj->mouse_grabbed > 0)
530 obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed; 530 obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed;
531 if ((obj->mouse_in) || (obj->mouse_grabbed > 0)) 531 if ((obj->mouse_in) || (obj->mouse_grabbed > 0))
532 obj->layer->evas->pointer.object.in = eina_list_remove(obj->layer->evas->pointer.object.in, obj); 532 obj->layer->evas->pointer.object.in = eina_list_remove(obj->layer->evas->pointer.object.in, eo_obj);
533 obj->mouse_grabbed = 0; 533 obj->mouse_grabbed = 0;
534 obj->mouse_in = 0; 534 obj->mouse_in = 0;
535 if (obj->name) evas_object_name_set(eo_obj, NULL); 535 if (obj->name) evas_object_name_set(eo_obj, NULL);
@@ -1476,7 +1476,7 @@ _hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
1476 if (obj->mouse_grabbed > 0) 1476 if (obj->mouse_grabbed > 0)
1477 obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed; 1477 obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed;
1478 if ((obj->mouse_in) || (obj->mouse_grabbed > 0)) 1478 if ((obj->mouse_in) || (obj->mouse_grabbed > 0))
1479 obj->layer->evas->pointer.object.in = eina_list_remove(obj->layer->evas->pointer.object.in, obj); 1479 obj->layer->evas->pointer.object.in = eina_list_remove(obj->layer->evas->pointer.object.in, eo_obj);
1480 obj->mouse_grabbed = 0; 1480 obj->mouse_grabbed = 0;
1481 if (obj->layer->evas->is_frozen) 1481 if (obj->layer->evas->is_frozen)
1482 { 1482 {
@@ -1513,7 +1513,7 @@ _hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
1513 if (obj->mouse_grabbed > 0) 1513 if (obj->mouse_grabbed > 0)
1514 obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed; 1514 obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed;
1515 if ((obj->mouse_in) || (obj->mouse_grabbed > 0)) 1515 if ((obj->mouse_in) || (obj->mouse_grabbed > 0))
1516 obj->layer->evas->pointer.object.in = eina_list_remove(obj->layer->evas->pointer.object.in, obj); 1516 obj->layer->evas->pointer.object.in = eina_list_remove(obj->layer->evas->pointer.object.in, eo_obj);
1517 obj->mouse_grabbed = 0; 1517 obj->mouse_grabbed = 0;
1518 obj->mouse_in = 0; 1518 obj->mouse_in = 0;
1519 */ 1519 */
@@ -1971,7 +1971,7 @@ _canvas_objects_at_xy_get(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
1971 evas_object_clip_recalc(eo_obj, obj); 1971 evas_object_clip_recalc(eo_obj, obj);
1972 if ((evas_object_is_in_output_rect(eo_obj, obj, xx, yy, 1, 1)) && 1972 if ((evas_object_is_in_output_rect(eo_obj, obj, xx, yy, 1, 1)) &&
1973 (!obj->clip.clipees)) 1973 (!obj->clip.clipees))
1974 in = eina_list_prepend(in, obj); 1974 in = eina_list_prepend(in, eo_obj);
1975 } 1975 }
1976 } 1976 }
1977 *ret = in; 1977 *ret = in;
@@ -2043,7 +2043,7 @@ _canvas_objects_in_rectangle_get(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
2043 evas_object_clip_recalc(eo_obj, obj); 2043 evas_object_clip_recalc(eo_obj, obj);
2044 if ((evas_object_is_in_output_rect(eo_obj, obj, xx, yy, ww, hh)) && 2044 if ((evas_object_is_in_output_rect(eo_obj, obj, xx, yy, ww, hh)) &&
2045 (!obj->clip.clipees)) 2045 (!obj->clip.clipees))
2046 in = eina_list_prepend(in, obj); 2046 in = eina_list_prepend(in, eo_obj);
2047 } 2047 }
2048 } 2048 }
2049 *ret = in; 2049 *ret = in;