[Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/ButtonE...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/03 21:49:46

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: ButtonEventsTest.c 
        server         : button_character_instance.cpp 

Log message:
        Button characters should have a _name property.
        Fixes the never-loading "free software movement" animation from Ubuntu
        movie.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6173&r2=1.6174
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ButtonEventsTest.c?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.83&r2=1.84

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6173
retrieving revision 1.6174
diff -u -b -r1.6173 -r1.6174
--- ChangeLog   3 Apr 2008 21:18:23 -0000       1.6173
+++ ChangeLog   3 Apr 2008 21:49:44 -0000       1.6174
@@ -1,5 +1,13 @@
 2008-04-03 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/ButtonEventsTest.c: test that button
+         instances should have a _name property.
+       * server/button_character_instance.cpp: provide a _name property
+         for button characters. Fixes the never-loading "free software
+         movement" animation from Ubuntu movie.
+
+2008-04-03 Sandro Santilli <address@hidden>
+
        * server/: Property.cpp, PropertyList.{cpp,h},
          as_object.{cpp,h}: add support for setter-less
          gette-rsetters.

Index: testsuite/misc-ming.all/ButtonEventsTest.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ButtonEventsTest.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/misc-ming.all/ButtonEventsTest.c  14 Nov 2007 08:16:04 -0000      
1.9
+++ testsuite/misc-ming.all/ButtonEventsTest.c  3 Apr 2008 21:49:45 -0000       
1.10
@@ -121,10 +121,13 @@
        SWFButton_addAction(bu, compileSWFActionCode(
                "_root.msg='MouseDown';"
                "_root.note('SWFBUTTON_MOUSEDOWN');"
-               // Target of button action is the button's parent sprite
+               // Target (and name) of button action is the button's parent 
sprite
                "_root.check_equals(_target, '/square1');"
+               "_root.check_equals(_name, 'square1');"
                "setTarget('/');"
                "_root.check_equals(_target, '/');"
+               "_root.check_equals(typeof(_name), 'string');"
+               "_root.check_equals(_name, '');"
                ), SWFBUTTON_MOUSEDOWN);
 
        SWFButton_addAction(bu, compileSWFActionCode(
@@ -139,8 +142,10 @@
        SWFButton_addAction(bu, compileSWFActionCode(
                "_root.msg='MouseUpOutside';"
                "_root.note('SWFBUTTON_MOUSEUPOUTSIDE');"
+               "_root.check(!'SWFBUTTON_MOUSEUPOUTSIDE should never be 
invoked?');"
                // Target of button action is the button's parent sprite
                "_root.check_equals(_target, '/square1');"
+               "_root.check_equals(_name, 'square1');"
                "setTarget('/');"
                "_root.check_equals(_target, '/');"
                ), SWFBUTTON_MOUSEUPOUTSIDE);
@@ -211,7 +216,7 @@
  
        mo = newSWFMovie();
        SWFMovie_setDimension(mo, 800, 600);
-       SWFMovie_setRate(mo, 0.5);
+       SWFMovie_setRate(mo, 0.2);
 
        if ( argc>1 ) srcdir=argv[1];
        else

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- server/button_character_instance.cpp        31 Mar 2008 23:48:32 -0000      
1.83
+++ server/button_character_instance.cpp        3 Apr 2008 21:49:46 -0000       
1.84
@@ -230,6 +230,9 @@
        gettersetter = &character::target_getset;
        o.init_property("_target", *gettersetter, *gettersetter);
        
+       gettersetter = character::name_getset;
+       o.init_property("_name", gettersetter, gettersetter);
+       
        gettersetter = &button_character_instance::enabled_getset;
        o.init_property("enabled", *gettersetter, *gettersetter);