From 026c9430554e9e5cfd8fc4b2e2dec2f2900d9e29 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sun, 19 Feb 2017 21:30:04 +0300
Subject: [PATCH] Fixed tests

---
 src/Avalonia.Controls/TopLevel.cs                  | 4 +++-
 src/Avalonia.Controls/WindowBase.cs                | 5 ++++-
 tests/Avalonia.Controls.UnitTests/TopLevelTests.cs | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 45bb655184..4de0256a7d 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -129,7 +129,7 @@ namespace Avalonia.Controls
         public Size ClientSize
         {
             get { return _clientSize; }
-            private set { SetAndRaise(ClientSizeProperty, ref _clientSize, value); }
+            protected set { SetAndRaise(ClientSizeProperty, ref _clientSize, value); }
         }
 
         /// <summary>
@@ -216,6 +216,8 @@ namespace Avalonia.Controls
         protected virtual void HandleResized(Size clientSize)
         {
             ClientSize = clientSize;
+            Width = clientSize.Width;
+            Height = clientSize.Height;
             LayoutManager.Instance.ExecuteLayoutPass();
             PlatformImpl.Invalidate(new Rect(clientSize));
         }
diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs
index 07597984c4..ac6eea8641 100644
--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@@ -137,7 +137,10 @@ namespace Avalonia.Controls
                 Width = clientSize.Width;
                 Height = clientSize.Height;
             }
-            base.HandleResized(clientSize);
+            ClientSize = clientSize;
+            LayoutManager.Instance.ExecuteLayoutPass();
+            PlatformImpl.Invalidate(new Rect(clientSize));
+
         }
 
         /// <summary>
diff --git a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
index 0614906306..e19729706d 100644
--- a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
@@ -86,7 +86,6 @@ namespace Avalonia.Controls.UnitTests
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
                 var impl = new Mock<ITopLevelImpl>();
-                impl.SetupProperty(x => x.ClientSize);
                 impl.SetupProperty(x => x.Resized);
                 impl.SetupGet(x => x.Scaling).Returns(1);