banshee r3777 - in trunk/banshee: . src/Libraries/Hyena.Gui/Hyena.Gui.Theatrics src/Libraries/Hyena.Gui/Hyena.Widgets

[scottp svn gnome org]

Author: scottp
Date: Wed Apr 16 06:19:03 2008
New Revision: 3777
URL: http://svn.gnome.org/viewvc/banshee?rev=3777&view=rev

Log:
* src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs: Added support
for BorderWidth. Sexeh!

* src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs: Use
QueueRedrawNoResize rather than QueueRedraw. This makes things
smoother with Downstage blocking.

* src/Libraries/Hyena.Gui/Hyena.Gui.Theatrics/SingleActorStage.cs: Add
an overload for Reload which takes a new duration.

Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.Theatrics/SingleActorStage.cs
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.Theatrics/SingleActorStage.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.Theatrics/SingleActorStage.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Gui.Theatrics/SingleActorStage.cs	Wed Apr 16 06:19:03 2008
@@ -52,6 +52,11 @@
             AddOrReset (target);
         }
         
+        public void Reset (uint duration)
+        {
+            AddOrReset (target, duration);
+        }
+        
         public Actor<object> Actor {
             get { return this[target]; }
         }

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedBox.cs	Wed Apr 16 06:19:03 2008
@@ -40,7 +40,7 @@
     {
         private readonly Stage<AnimatedWidget> stage = new Stage<AnimatedWidget> ();
         private readonly LinkedList<AnimatedWidget> children = new LinkedList<AnimatedWidget> ();
-        private readonly object children_mutex = new object ();
+        private readonly SingleActorStage border_stage = new Hyena.Gui.Theatrics.SingleActorStage ();
         private readonly bool horizontal;
         
         private uint duration = 500;
@@ -49,53 +49,66 @@
         private int spacing;
         private int start_spacing;
         private int end_spacing;
+        private int active_count;
+        
+        private int border;
+        private double border_bias;
+        private Easing border_easing;
+        private AnimationState border_state;
         
         protected AnimatedBox (bool horizontal)
         {
             WidgetFlags |= WidgetFlags.NoWindow;
             this.horizontal = horizontal;
             stage.ActorStep += OnActorStep;
-            stage.Iteration += OnIteration;
+            border_stage.Iteration += OnBorderIteration;
         }
         
 #region Private
         
+        private double Percent {
+            get { return border_stage.Actor.Percent * border_bias + (1.0 - border_bias); }
+        }
+        
         private bool OnActorStep (Actor<AnimatedWidget> actor)
         {
-            lock (actor.Target) {
-                switch (actor.Target.AnimationState) {
-                case AnimationState.Coming:
-                    actor.Target.Percent = actor.Percent;
-                    if (actor.Expired) {
-                        actor.Target.AnimationState = AnimationState.Idle;
-                        return false;
-                    }
-                    break;
-                case AnimationState.IntendingToGo:
-                    actor.Target.AnimationState = AnimationState.Going;
-                    actor.Target.Bias = actor.Percent;
-                    actor.Reset ((uint)(actor.Target.Duration * actor.Percent));
-                    break;
-                case AnimationState.Going:
-                    if (actor.Expired) {
-                        lock (children_mutex) {
-                            actor.Target.Unparent ();
-                            children.Remove (actor.Target.Node);
-                        }
-                        return false;
-                    } else {
-                        actor.Target.Percent = 1.0 - actor.Percent;
-                    }
-                    break;
+            switch (actor.Target.AnimationState) {
+            case AnimationState.Coming:
+                actor.Target.Percent = actor.Percent;
+                if (actor.Expired) {
+                    actor.Target.AnimationState = AnimationState.Idle;
+                    return false;
+                }
+                break;
+            case AnimationState.IntendingToGo:
+                actor.Target.AnimationState = AnimationState.Going;
+                actor.Target.Bias = actor.Percent;
+                actor.Reset ((uint)(actor.Target.Duration * actor.Percent));
+                break;
+            case AnimationState.Going:
+                if (actor.Expired) {
+                    actor.Target.Unparent ();
+                    children.Remove (actor.Target.Node);
+                    return false;
+                } else {
+                    actor.Target.Percent = 1.0 - actor.Percent;
                 }
+                break;
             }
             
             return true;
         }
         
-        private void OnIteration (object sender, EventArgs args)
+        private void OnBorderIteration (object sender, EventArgs args)
         {
-            QueueResize ();
+            if (border_stage.Actor == null) {
+                border = border_state == AnimationState.Coming ? (int)BorderWidth : 0;
+                border_state = AnimationState.Idle;
+            } else {
+                double percent = border_state == AnimationState.Coming ? Percent : 1.0 - Percent;
+                border = Choreographer.Compose (percent, (int)BorderWidth, border_easing);
+            }
+            QueueResizeNoRedraw ();
         }
         
         private void OnWidgetDestroyed (object sender, EventArgs args)
@@ -121,6 +134,7 @@
                     skip_count--;
                 }
                 widget.EndPadding = end_spacing;
+                
                 if (widget.Node.Previous == null) {
                     while (true) {
                         widget.StartPadding = 0;
@@ -133,6 +147,7 @@
                         skip_count++;
                     }
                 }
+                
                 if (widget.Node.Next == null) {
                     while (true) {
                         widget.EndPadding = 0;
@@ -161,6 +176,12 @@
             int width = 0;
             int height = 0;
             
+            if (horizontal) {
+                width = border * 2;
+            } else {
+                height = border * 2;
+            }
+            
             foreach (AnimatedWidget widget in Widgets) {
                 Requisition req = widget.SizeRequest ();
                 if (horizontal) {
@@ -179,6 +200,15 @@
         protected override void OnSizeAllocated (Rectangle allocation)
         {
             base.OnSizeAllocated (allocation);
+            if (horizontal) {
+                allocation.X += border;
+                allocation.Y += (int)BorderWidth;
+                allocation.Height -= (int)BorderWidth * 2;
+            } else {
+                allocation.X += (int)BorderWidth;
+                allocation.Y += border;
+                allocation.Width -= (int)BorderWidth * 2;
+            }
             
             foreach (AnimatedWidget widget in Widgets) {
                 if (horizontal) {
@@ -233,10 +263,8 @@
         
         internal IEnumerable<AnimatedWidget> Widgets {
             get {
-                lock (children_mutex) {
-                    foreach (AnimatedWidget child in children) {
-                        yield return child;
-                    }
+                foreach (AnimatedWidget child in children) {
+                    yield return child;
                 }
             }
         }
@@ -335,13 +363,22 @@
             animated_widget.Parent = this;
             animated_widget.WidgetDestroyed += OnWidgetDestroyed;
             stage.Add (animated_widget, duration);
-            lock (children_mutex) {
-                animated_widget.Node = end 
-                    ? children.AddLast (animated_widget)
-                    : children.AddFirst (animated_widget);
-            }
+            animated_widget.Node = end 
+                ? children.AddLast (animated_widget)
+                : children.AddFirst (animated_widget);
             
             RecalculateSpacings ();
+            if (active_count == 0) {
+                if (border_state == AnimationState.Going) {
+                    border_bias = Percent;
+                } else {
+                    border_easing = easing;
+                    border_bias = 1.0;
+                }
+                border_state = AnimationState.Coming;
+                border_stage.Reset ((uint)(duration * border_bias));
+            }
+            active_count++;
         }
         
 #endregion
@@ -417,35 +454,47 @@
         
         private void RemoveCore (AnimatedWidget widget, uint duration, Easing easing, Blocking blocking, bool use_easing, bool use_blocking)
         {
-            lock (widget) {
-                if (duration > 0) {
-                    widget.Duration = duration;
-                }
-                
-                if (use_easing) {
-                    widget.Easing = easing;
-                }
-                
-                if (use_blocking) {
-                    widget.Blocking = blocking;
+            if (duration > 0) {
+                widget.Duration = duration;
+            }
+            
+            if (use_easing) {
+                widget.Easing = easing;
+            }
+            
+            if (use_blocking) {
+                widget.Blocking = blocking;
+            }
+        
+            if (widget.AnimationState == AnimationState.Coming) {
+                widget.AnimationState = AnimationState.IntendingToGo;
+            } else {
+                if (widget.Easing == Easing.QuadraticIn) {
+                    widget.Easing = Easing.QuadraticOut;
+                } else if (widget.Easing == Easing.QuadraticOut) {
+                    widget.Easing = Easing.QuadraticIn;
+                } else if (widget.Easing == Easing.ExponentialIn) {
+                    widget.Easing = Easing.ExponentialOut;
+                } else if (widget.Easing == Easing.ExponentialOut) {
+                    widget.Easing = Easing.ExponentialIn;
                 }
+                widget.AnimationState = AnimationState.Going;
+                stage.Add (widget, widget.Duration);
+            }
+            
+            duration = widget.Duration;
+            easing = widget.Easing;
             
-                if (widget.AnimationState == AnimationState.Coming) {
-                    widget.AnimationState = AnimationState.IntendingToGo;
+            active_count--;
+            if (active_count == 0) {
+                if (border_state == AnimationState.Coming) {
+                    border_bias = Percent;
                 } else {
-                    if (widget.Easing == Easing.QuadraticIn) {
-                        widget.Easing = Easing.QuadraticOut;
-                    } else if (widget.Easing == Easing.QuadraticOut) {
-                        widget.Easing = Easing.QuadraticIn;
-                    } else if (widget.Easing == Easing.ExponentialIn) {
-                        widget.Easing = Easing.ExponentialOut;
-                    } else if (widget.Easing == Easing.ExponentialOut) {
-                        widget.Easing = Easing.ExponentialIn;
-                    }
-                    
-                    widget.AnimationState = AnimationState.Going;
-                    stage.Add (widget, widget.Duration);
+                    border_easing = easing;
+                    border_bias = 1.0;
                 }
+                border_state = AnimationState.Going;
+                border_stage.Reset ((uint)(duration * border_bias));
             }
         }
         
@@ -456,7 +505,6 @@
                     RemoveCore (child);
                 }
             }
-            
             RecalculateSpacings ();
         }
         

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Widgets/AnimatedWidget.cs	Wed Apr 16 06:19:03 2008
@@ -86,7 +86,7 @@
             get { return percent; }
             set {
                 percent = value * Bias;
-                QueueResize ();
+                QueueResizeNoRedraw ();
             }
         }