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

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   06/10/26 17:29:09

Modified files:
        .              : ChangeLog 
        server         : button_character_instance.cpp 

Log message:
        Fixed invalidated bounds detection on button state change

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1399&r2=1.1400
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.1399
retrieving revision 1.1400
diff -u -b -r1.1399 -r1.1400
--- ChangeLog   26 Oct 2006 14:45:28 -0000      1.1399
+++ ChangeLog   26 Oct 2006 17:29:09 -0000      1.1400
@@ -27,6 +27,8 @@
          gui/gui.h, gui/sdl_agg_glue.cpp, gui/sdl_agg_glue.h:
          Reverted Bastiaan's changes (set_invalidated_region)
        * server/dlist.cpp: Improved invalidated bounds method
+       * server/button_character_instance.cpp: Fixed invalidated 
+         bounds detection on button state change
 
 2006-10-25 Sandro Santilli <address@hidden>
 

Index: server/button_character_instance.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/button_character_instance.cpp        18 Oct 2006 18:41:42 -0000      
1.9
+++ server/button_character_instance.cpp        26 Oct 2006 17:29:09 -0000      
1.10
@@ -368,25 +368,25 @@
 void
 button_character_instance::on_button_event(event_id event)
 {
-  e_mouse_state prev_state = m_mouse_state;
+  e_mouse_state new_state = m_mouse_state;
   
        // Set our mouse state (so we know how to render).
        switch (event.m_id)
        {
        case event_id::ROLL_OUT:
        case event_id::RELEASE_OUTSIDE:
-               m_mouse_state = UP;
+               new_state = UP;
                break;
 
        case event_id::RELEASE:
        case event_id::ROLL_OVER:
        case event_id::DRAG_OUT:
-               m_mouse_state = OVER;
+               new_state = OVER;
                break;
 
        case event_id::PRESS:
        case event_id::DRAG_OVER:
-               m_mouse_state = DOWN;
+               new_state = DOWN;
                break;
 
        default:
@@ -394,8 +394,10 @@
                break;
        };
        
-       if (prev_state!=m_mouse_state) 
+       if (new_state!=m_mouse_state) {
     set_invalidated();
+    m_mouse_state=new_state; 
+  }
     
 
        // Button transition sounds.