Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_events.c evas_object_line.c evas_object_main.c
evas_object_polygon.c evas_object_text.c evas_stack.c
Log Message:
propogate pass_events to sub-objects of smart objects...
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_events.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- evas_events.c 16 Apr 2004 01:38:14 -0000 1.20
+++ evas_events.c 14 Jun 2004 06:04:22 -0000 1.21
@@ -2,6 +2,14 @@
#include "evas_private.h"
#include "Evas.h"
+int
+evas_event_passes_through(Evas_Object *obj)
+{
+ if (obj->pass_events) return 1;
+ if (obj->smart.parent) return evas_event_passes_through(obj->smart.parent);
+ return 0;
+}
+
Evas_List *
evas_event_objects_event_list(Evas *e, Evas_Object *stop, int x, int y)
{
@@ -21,7 +29,7 @@
obj = (Evas_Object *)l2;
if (obj == stop) goto done;
- if ((!obj->pass_events) && (!obj->smart.smart))
+ if ((!evas_event_passes_through(obj)) && (!obj->smart.smart))
{
evas_object_clip_recalc(obj);
if ((evas_object_is_in_output_rect(obj, x, y, 1, 1)) &&
@@ -363,7 +371,7 @@
obj = l->data;
if ((obj->cur.visible) &&
(evas_object_clippers_is_visible(obj)) &&
- (!obj->pass_events) &&
+ (!evas_event_passes_through(obj)) &&
(!obj->smart.smart) &&
(!obj->clip.clipees))
{
@@ -436,7 +444,7 @@
(obj->cur.visible) &&
(evas_object_clippers_is_visible(obj)) &&
(evas_list_find(ins, obj)) &&
- (!obj->pass_events) &&
+ (!evas_event_passes_through(obj)) &&
(!obj->smart.smart) &&
(!obj->clip.clipees))
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_line.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_object_line.c 16 Feb 2004 19:22:48 -0000 1.7
+++ evas_object_line.c 14 Jun 2004 06:04:22 -0000 1.8
@@ -103,7 +103,7 @@
MAGIC_CHECK_END();
if ((x1 == o->cur.x1) && (y1 == o->cur.y1) &&
(x2 == o->cur.x2) && (y2 == o->cur.y2)) return;
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
was = evas_object_is_in_output_rect(obj,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y, 1, 1);
@@ -142,7 +142,7 @@
is = evas_object_is_in_output_rect(obj,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y, 1, 1);
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
{
if ((is ^ was) && obj->cur.visible)
evas_event_feed_mouse_move(obj->layer->evas,
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- evas_object_main.c 8 Mar 2004 02:42:08 -0000 1.18
+++ evas_object_main.c 14 Jun 2004 06:04:22 -0000 1.19
@@ -457,7 +457,7 @@
evas_object_inform_call_move(obj);
return;
}
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
was = evas_object_is_in_output_rect(obj,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y, 1, 1);
@@ -466,7 +466,7 @@
obj->cur.cache.geometry.validity = 0;
evas_object_change(obj);
evas_object_recalc_clippees(obj);
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
{
if (!obj->smart.smart)
{
@@ -510,7 +510,7 @@
evas_object_inform_call_resize(obj);
return;
}
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
was = evas_object_is_in_output_rect(obj,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y, 1, 1);
@@ -519,7 +519,7 @@
obj->cur.cache.geometry.validity = 0;
evas_object_change(obj);
evas_object_recalc_clippees(obj);
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
{
if (!obj->smart.smart)
{
@@ -585,7 +585,7 @@
obj->cur.visible = 1;
evas_object_change(obj);
evas_object_recalc_clippees(obj);
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
{
if (!obj->smart.smart)
{
@@ -627,7 +627,7 @@
obj->cur.visible = 0;
evas_object_change(obj);
evas_object_recalc_clippees(obj);
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
{
if (!obj->smart.smart)
{
@@ -782,7 +782,7 @@
obj = (Evas_Object *)l2;
if (obj->delete_me) continue;
- if ((!include_pass_events_objects) && (obj->pass_events)) continue;
+ if ((!include_pass_events_objects) && (evas_event_passes_through(obj)))
continue;
if ((!include_hidden_objects) && (!obj->cur.visible)) continue;
evas_object_clip_recalc(obj);
if ((evas_object_is_in_output_rect(obj, xx, yy, 1, 1)) &&
@@ -838,7 +838,7 @@
obj = (Evas_Object *)l2;
if (obj->delete_me) continue;
- if ((!include_pass_events_objects) && (obj->pass_events)) continue;
+ if ((!include_pass_events_objects) && (evas_event_passes_through(obj)))
continue;
if ((!include_hidden_objects) && (!obj->cur.visible)) continue;
evas_object_clip_recalc(obj);
if ((evas_object_is_in_output_rect(obj, xx, yy, ww, hh)) &&
@@ -879,7 +879,7 @@
obj = (Evas_Object *)l2;
if (obj->delete_me) continue;
- if ((!include_pass_events_objects) && (obj->pass_events)) continue;
+ if ((!include_pass_events_objects) && (evas_event_passes_through(obj)))
continue;
if ((!include_hidden_objects) && (!obj->cur.visible)) continue;
evas_object_clip_recalc(obj);
if ((evas_object_is_in_output_rect(obj, xx, yy, 1, 1)) &&
@@ -924,7 +924,7 @@
obj = (Evas_Object *)l2;
if (obj->delete_me) continue;
- if ((!include_pass_events_objects) && (obj->pass_events)) continue;
+ if ((!include_pass_events_objects) && (evas_event_passes_through(obj)))
continue;
if ((!include_hidden_objects) && (!obj->cur.visible)) continue;
evas_object_clip_recalc(obj);
if ((evas_object_is_in_output_rect(obj, xx, yy, ww, hh)) &&
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_polygon.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_object_polygon.c 16 Feb 2004 19:22:48 -0000 1.7
+++ evas_object_polygon.c 14 Jun 2004 06:04:22 -0000 1.8
@@ -99,7 +99,7 @@
MAGIC_CHECK(o, Evas_Object_Polygon, MAGIC_OBJ_POLYGON);
return;
MAGIC_CHECK_END();
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
was = evas_object_is_in_output_rect(obj,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y, 1, 1);
@@ -139,7 +139,7 @@
is = evas_object_is_in_output_rect(obj,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y, 1, 1);
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
{
if ((is ^ was) && obj->cur.visible)
evas_event_feed_mouse_move(obj->layer->evas,
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_text.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- evas_object_text.c 6 May 2004 02:19:15 -0000 1.24
+++ evas_object_text.c 14 Jun 2004 06:04:22 -0000 1.25
@@ -578,7 +578,7 @@
same_font = 1;
if (size == o->cur.size) return;
}
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
was = evas_object_is_in_output_rect(obj,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y, 1, 1);
@@ -705,7 +705,7 @@
o->changed = 1;
evas_object_change(obj);
evas_object_coords_recalc(obj);
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
{
is = evas_object_is_in_output_rect(obj,
obj->layer->evas->pointer.x,
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_stack.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_stack.c 16 Mar 2004 04:13:05 -0000 1.8
+++ evas_stack.c 14 Jun 2004 06:04:22 -0000 1.9
@@ -73,7 +73,7 @@
}
obj->restack = 1;
evas_object_change(obj);
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
{
if (!obj->smart.smart)
{
@@ -119,7 +119,7 @@
}
obj->restack = 1;
evas_object_change(obj);
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
{
if (!obj->smart.smart)
{
@@ -173,7 +173,7 @@
}
obj->restack = 1;
evas_object_change(obj);
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
{
if (!obj->smart.smart)
{
@@ -227,7 +227,7 @@
}
obj->restack = 1;
evas_object_change(obj);
- if (!obj->pass_events)
+ if (!evas_event_passes_through(obj))
{
if (!obj->smart.smart)
{
-------------------------------------------------------
This SF.Net email is sponsored by the new InstallShield X.
>From Windows to Linux, servers to mobile, InstallShield X is the
one installation-authoring solution that does it all. Learn more and
evaluate today! http://www.installshield.com/Dev2Dev/0504
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
