From 18682a74f753f49acb0c16c631cbce58f42558dd Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 23 Aug 2015 19:32:45 +0200
Subject: [PATCH] Use client size for top-level arrange.

Fixes #23.
---
 Perspex.Controls/TopLevel.cs                      | 2 +-
 Tests/Perspex.Controls.UnitTests/TopLevelTests.cs | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Perspex.Controls/TopLevel.cs b/Perspex.Controls/TopLevel.cs
index 52dde51d96b..04cfecdf2c7 100644
--- 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
index 7a82ffecf92..0f596362929 100644
--- 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)
                 {