Author: fejj
Date: 2007-12-03 13:22:50 -0500 (Mon, 03 Dec 2007)
New Revision: 90575

Modified:
   trunk/moon/src/ChangeLog
   trunk/moon/src/animation.cpp
   trunk/moon/src/dependencyobject.cpp
Log:
2007-12-03  Jeffrey Stedfast  <[EMAIL PROTECTED]>

        * dependencyobject.cpp (RemoveHandler): Simplified a little.

        * animation.cpp (Stop): Remove the CompletedEvent root_clock
        handler. Fixes Simon's GAME OVER! textblock storyboard.



Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog    2007-12-03 18:22:15 UTC (rev 90574)
+++ trunk/moon/src/ChangeLog    2007-12-03 18:22:50 UTC (rev 90575)
@@ -1,5 +1,12 @@
 2007-12-03  Jeffrey Stedfast  <[EMAIL PROTECTED]>
 
+       * dependencyobject.cpp (RemoveHandler): Simplified a little.
+
+       * animation.cpp (Stop): Remove the CompletedEvent root_clock
+       handler. Fixes Simon's GAME OVER! textblock storyboard.
+
+2007-12-03  Jeffrey Stedfast  <[EMAIL PROTECTED]>
+
        * runtime.cpp: Added clipping/bounding-box override values.
 
        * uielement.cpp (DoRender): Changed optional bounding-box/clipping

Modified: trunk/moon/src/animation.cpp
===================================================================
--- trunk/moon/src/animation.cpp        2007-12-03 18:22:15 UTC (rev 90574)
+++ trunk/moon/src/animation.cpp        2007-12-03 18:22:50 UTC (rev 90575)
@@ -227,9 +227,9 @@
 }
 
 void
-Storyboard::invoke_completed (EventObject *, gpointer, gpointer closure)
+Storyboard::invoke_completed (EventObject *sender, gpointer calldata, gpointer 
closure)
 {
-       Storyboard* sb = (Storyboard*)closure;
+       Storyboard *sb = (Storyboard *) closure;
        sb->Emit (sb->CompletedEvent);
 }
 
@@ -314,8 +314,10 @@
 void
 Storyboard::Stop ()
 {
-       if (root_clock)
+       if (root_clock) {
+               root_clock->RemoveHandler (root_clock->CompletedEvent, 
invoke_completed, this);
                root_clock->Stop ();
+       }
 }
 
 Storyboard *

Modified: trunk/moon/src/dependencyobject.cpp
===================================================================
--- trunk/moon/src/dependencyobject.cpp 2007-12-03 18:22:15 UTC (rev 90574)
+++ trunk/moon/src/dependencyobject.cpp 2007-12-03 18:22:50 UTC (rev 90575)
@@ -132,19 +132,15 @@
 
        if (events == NULL)
                return;
-
-       GSList *l;
-       for (l = events[event_id]; l; l = l->next) {
+       
+       for (GSList *l = events[event_id]; l; l = l->next) {
                EventClosure *closure = (EventClosure*)l->data;
-               if (closure->func == handler && closure->data == data)
+               if (closure->func == handler && closure->data == data) {
+                       delete (EventClosure *) l->data;
+                       events[event_id] = g_slist_delete_link 
(events[event_id], l);
                        break;
+               }
        }
-
-       if (l == NULL) /* we didn't find it */
-               return;
-
-       delete (EventClosure*)l->data;
-       events[event_id] = g_slist_delete_link (events[event_id], l);
 }
 
 void

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to