Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_main.c
Log Message:
fix mouse grab accounting on delete and hide
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_main.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- evas_object_main.c 21 Sep 2004 03:15:42 -0000 1.22
+++ evas_object_main.c 20 Nov 2004 07:41:14 -0000 1.23
@@ -665,16 +665,24 @@
evas_event_feed_mouse_move(obj->layer->evas,
obj->layer->evas->pointer.x,
obj->layer->evas->pointer.y);
-/* if ((obj->mouse_in) || (obj->mouse_grabbed)) */
+ if (obj->mouse_grabbed > 0)
+ {
+ if (obj->layer->evas->pointer.mouse_grabbed > 0)
+ obj->layer->evas->pointer.mouse_grabbed -=
obj->mouse_grabbed;
+ }
{
- obj->mouse_in = 0;
obj->mouse_grabbed = 0;
obj->layer->evas->pointer.object.in =
evas_list_remove(obj->layer->evas->pointer.object.in, obj);
- if (obj->layer->evas->events_frozen > 0) return;
+ if (obj->layer->evas->events_frozen > 0)
+ {
+ obj->mouse_in = 0;
+ return;
+ }
if (obj->mouse_in)
{
Evas_Event_Mouse_Out ev;
+ obj->mouse_in = 0;
ev.buttons = obj->layer->evas->pointer.button;
ev.output.x = obj->layer->evas->pointer.x;
ev.output.y = obj->layer->evas->pointer.y;
-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
