Merge remote-tracking branch 'origin/master' into devtools

Conflicts:
	Perspex.Controls/Panel.cs

Perspex.Controls/Panel.cs

@@ -29,7 +29,7 @@ namespace Perspex.Controls
 
                 return this.children;
             }
-            
+
             set
             {
                 Contract.Requires<ArgumentNullException>(value != null);
@@ -48,6 +48,7 @@ namespace Perspex.Controls
                     {
                         this.children.CollectionChanged += ChildrenChanged;
                         this.AddVisualChildren(value);
+                        this.InvalidateMeasure();
                     }
                 }
             }
@@ -71,6 +72,8 @@ namespace Perspex.Controls
                     this.AddVisualChildren(this.children);
                     break;
             }
+
+            this.InvalidateMeasure();
         }
     }
 }

Perspex.Layout/Layoutable.cs

@@ -8,6 +8,7 @@ namespace Perspex.Layout
 {
     using System;
     using System.Linq;
+    using Splat;
 
     public enum HorizontalAlignment
     {
@@ -25,7 +26,7 @@ namespace Perspex.Layout
         Bottom,
     }
 
-    public class Layoutable : Visual, ILayoutable
+    public class Layoutable : Visual, ILayoutable, IEnableLogger
     {
         public static readonly PerspexProperty<double> WidthProperty =
             PerspexProperty.Register<Layoutable, double>("Width", double.NaN);
@@ -123,10 +124,22 @@ namespace Perspex.Layout
         {
             availableSize = availableSize.Deflate(this.Margin);
             this.DesiredSize = this.MeasureCore(availableSize).Constrain(availableSize);
+
+            this.Log().Debug(string.Format(
+                "Measure of {0} (#{1:x8}) requested {2} ",
+                this.GetType().Name,
+                this.GetHashCode(),
+                this.DesiredSize));
         }
 
         public void Arrange(Rect rect)
         {
+            this.Log().Debug(string.Format(
+                "Arrange of {0} (#{1:x8}) gave {2} ",
+                this.GetType().Name,
+                this.GetHashCode(),
+                rect));
+
             if (this.DesiredSize.HasValue)
             {
                 this.ArrangeCore(rect);

Perspex.Windows/Window.cs

@@ -34,8 +34,6 @@ namespace Perspex.Windows
 
         private IInputManager inputManager;
 
-        private bool layoutPending;
-
         public Window()
         {
             IPlatformRenderInterface factory = Locator.Current.GetService<IPlatformRenderInterface>();
@@ -48,9 +46,8 @@ namespace Perspex.Windows
             this.inputManager = Locator.Current.GetService<IInputManager>();
             this.Template = ControlTemplate.Create<Window>(this.DefaultTemplate);
 
-            this.LayoutManager.LayoutNeeded.Where(_ => !this.layoutPending).Subscribe(x => 
+            this.LayoutManager.LayoutNeeded.Subscribe(x => 
             {
-                this.layoutPending = true;
                 WindowsDispatcher.CurrentDispatcher.BeginInvoke(
                     DispatcherPriority.Render, 
                     () =>
@@ -58,22 +55,18 @@ namespace Perspex.Windows
                         this.LayoutManager.ExecuteLayoutPass();
                         this.renderer.Render(this);
                         this.RenderManager.RenderFinished();
-                        this.layoutPending = false;
                     });
             });
 
-            this.RenderManager.RenderNeeded.Where(_ => !layoutPending)
+            this.RenderManager.RenderNeeded
                 .Subscribe(x =>
             {
                 WindowsDispatcher.CurrentDispatcher.BeginInvoke(
                     DispatcherPriority.Render,
                     () =>
                     {
-                        if (!this.layoutPending)
-                        {
-                            this.renderer.Render(this);
-                            this.RenderManager.RenderFinished();
-                        }
+                        this.renderer.Render(this);
+                        this.RenderManager.RenderFinished();
                     });
             });
         }