[Gnash-commit] gnash ChangeLog server/button_character_instanc...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/11 18:30:47

Modified files:
        .              : ChangeLog 
        server         : button_character_instance.cpp 

Log message:
        (add_invalidated_bounds):
        check m_child_invalidated. Partially fixes bug #22904.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6259&r2=1.6260
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.84&r2=1.85

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6259
retrieving revision 1.6260
diff -u -b -r1.6259 -r1.6260
--- ChangeLog   11 Apr 2008 15:48:20 -0000      1.6259
+++ ChangeLog   11 Apr 2008 18:30:46 -0000      1.6260
@@ -1,5 +1,10 @@
 2008-04-11 Sandro Santilli <address@hidden>
 
+       * server/button_character_instance.cpp (add_invalidated_bounds):
+         check m_child_invalidated. Partially fixes bug #22904.
+
+2008-04-11 Sandro Santilli <address@hidden>
+
        * server/text.{cpp,h}: make has{x,y}offset flags and {x,y}offset
          values private.
        * server/parser/text_character_def.cpp: updated to avoid direct

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- server/button_character_instance.cpp        3 Apr 2008 21:49:46 -0000       
1.84
+++ server/button_character_instance.cpp        11 Apr 2008 18:30:47 -0000      
1.85
@@ -630,6 +630,7 @@
        get_active_characters(new_list, new_state);
                
        // see if the two lists differ and restart characters if needed
+       // TODO: FIXME: this is not how you check for equality :/
        if (new_list.size() != old_list.size())
                set_invalidated();              // something changed 
   
@@ -672,6 +673,7 @@
 
   // TODO: Instead of using these for loops again and again, wouldn't it be a
   // good idea to have a generic "get_record_character()" method?
+  // NOTE: we do have that method now, it's called get_active_characters(state)
        for (size_t i = 0; i < m_def->m_button_records.size(); i++)
        {
                button_record&  rec = m_def->m_button_records[i];
@@ -687,7 +689,7 @@
                                
/*bounds->expand_to_transformed_rect(get_world_matrix(), 
           m_record_character[i]->get_bound());*/
         m_record_character[i]->add_invalidated_bounds(ranges, 
-          force||m_invalidated);        
+          force||m_invalidated||m_child_invalidated);        
                }
        }