[Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/02/20 20:29:37

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 
        testsuite/misc-ming.all: DrawingApiTestRunner.cpp 

Log message:
                * server/sprite_instance.cpp (get_topmost_mouse_entity):
                  Check also drawable bounds !
                * testsuite/misc-ming.all/DrawingApiTestRunner.cpp:
                  Don't expect failure with filled shapes making
                  the MovieClip grab mouse envets. Add another test
                  showing that non-filled shapes (simple lines) still
                  fail in this.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2414&r2=1.2415
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.176&r2=1.177
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2414
retrieving revision 1.2415
diff -u -b -r1.2414 -r1.2415
--- ChangeLog   20 Feb 2007 20:20:23 -0000      1.2414
+++ ChangeLog   20 Feb 2007 20:29:37 -0000      1.2415
@@ -1,5 +1,15 @@
 2007-02-20 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (get_topmost_mouse_entity):
+         Check also drawable bounds !
+       * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: 
+         Don't expect failure with filled shapes making 
+         the MovieClip grab mouse envets. Add another test
+         showing that non-filled shapes (simple lines) still
+         fail in this.
+
+2007-02-20 Sandro Santilli <address@hidden>
+
        * server/sprite_instance.cpp (get_invalidated_bounds):
          Include bounds of drawable instance.
        * server/vm/with_stack_entry.h: add non-const

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -b -r1.176 -r1.177
--- server/sprite_instance.cpp  20 Feb 2007 20:20:23 -0000      1.176
+++ server/sprite_instance.cpp  20 Feb 2007 20:29:37 -0000      1.177
@@ -3324,6 +3324,10 @@
        MouseEntityFinder finder(p.m_x, p.m_y);
        m_display_list.visitBackward(finder);
        character* ch = finder.getEntity();
+       if ( ! ch ) 
+       {
+               ch = _drawable_inst->get_topmost_mouse_entity(p.m_x, p.m_y);
+       }
 
        if ( ch && can_handle_mouse_event() )
        {

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp    20 Feb 2007 14:58:34 
-0000      1.1
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp    20 Feb 2007 20:29:37 
-0000      1.2
@@ -56,16 +56,19 @@
 
        // Inside bottom-left blue fill
        tester.movePointerTo(60, 215);
-       xcheck(tester.isMouseOverMouseEntity());
+       check(tester.isMouseOverMouseEntity());
 
        // Inside cyan clockwise fill
        tester.movePointerTo(190, 112);
-       xcheck(tester.isMouseOverMouseEntity());
+       check(tester.isMouseOverMouseEntity());
 
        // Inside green counterclockwise fill
        tester.movePointerTo(220, 112);
-       xcheck(tester.isMouseOverMouseEntity());
+       check(tester.isMouseOverMouseEntity());
 
+       // Inside red "thick" line
+       tester.movePointerTo(146, 146);
+       xcheck(tester.isMouseOverMouseEntity());
 
 }