Use client size for top-level arrange.

Fixes #23.
AvaloniaUI · Aug 23, 2015 · 18682a7 · 18682a7
1 parent c90ffca
commit 18682a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Perspex.Controls/TopLevel.cs b/Perspex.Controls/TopLevel.cs
@@ -299,7 +299,7 @@ protected override Size ArrangeOverride(Size finalSize)
                 this.PlatformImpl.ClientSize = finalSize;
             }
 
-            return base.ArrangeOverride(finalSize);
+            return base.ArrangeOverride(this.PlatformImpl.ClientSize);
         }
 
         /// <summary>

diff --git a/Tests/Perspex.Controls.UnitTests/TopLevelTests.cs b/Tests/Perspex.Controls.UnitTests/TopLevelTests.cs
@@ -97,6 +97,8 @@ public void Bounds_Should_Be_Set_After_Layout_Pass()
                 Locator.CurrentMutable.RegisterConstant(new LayoutManager(), typeof(ILayoutManager));
 
                 var impl = new Mock<ITopLevelImpl>();
+                impl.SetupProperty(x => x.ClientSize);
+                impl.SetupProperty(x => x.Resized);
 
                 var target = new TestTopLevel(impl.Object)
                 {