From e54d0c75d1c64f26be1aa6e67fede778729e0040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Sun, 9 Jul 2017 14:03:22 +0100
Subject: [PATCH] Property changes.

---
 src/Avalonia.Controls/Window.cs     | 13 +++++++++++--
 src/Avalonia.Controls/WindowBase.cs |  9 +++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 7f0cab3237..f60768980d 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -78,9 +78,16 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<WindowIcon> IconProperty =
             AvaloniaProperty.Register<Window, WindowIcon>(nameof(Icon));
 
+        /// <summary>
+        /// Defines the <see cref="WindowStartupLocation"/> proeprty.
+        /// </summary>
+        public static readonly DirectProperty<Window, WindowStartupLocation> WindowStartupLocationProperty =
+            AvaloniaProperty.RegisterDirect<Window, WindowStartupLocation>(nameof(WindowStartupLocation), o => o.WindowStartupLocation);
+
         private readonly NameScope _nameScope = new NameScope();
         private object _dialogResult;
         private readonly Size _maxPlatformClientSize;
+        private WindowStartupLocation _windowStartupLoction;
 
         /// <summary>
         /// Initializes static members of the <see cref="Window"/> class.
@@ -188,8 +195,8 @@ namespace Avalonia.Controls
         /// </summary>
         public WindowStartupLocation WindowStartupLocation
         {
-            get;
-            set;
+            get { return _windowStartupLoction; }
+            set { SetAndRaise(WindowStartupLocationProperty, ref _windowStartupLoction, value); }
         }
 
         /// <inheritdoc/>
@@ -336,6 +343,8 @@ namespace Avalonia.Controls
         {
             if (WindowStartupLocation == WindowStartupLocation.CenterScreen)
             {
+                // This should be using a Screen API, but we don't have one yet and
+                // PlatformImpl.MaxClientSize is the best we have.
                 if (PlatformImpl != null)
                 {
                     var positionAsSize = PlatformImpl.MaxClientSize / 2 - ClientSize / 2;
diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs
index dd1e8fbef1..dd1e0ae842 100644
--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@@ -32,12 +32,13 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="Owner"/> property.
         /// </summary>
-        public static readonly StyledProperty<WindowBase> OwnerProperty =
-            AvaloniaProperty.Register<WindowBase, WindowBase>(nameof(Owner));
+        public static readonly DirectProperty<WindowBase, WindowBase> OwnerProperty =
+            AvaloniaProperty.RegisterDirect<WindowBase, WindowBase>(nameof(Owner), o => o.Owner);
 
         private bool _hasExecutedInitialLayoutPass;
         private bool _isActive;
         private bool _ignoreVisibilityChange;
+        private WindowBase _owner;
 
         static WindowBase()
         {
@@ -111,8 +112,8 @@ namespace Avalonia.Controls
         /// </summary>
         public WindowBase Owner
         {
-            get { return GetValue(OwnerProperty); }
-            set { SetValue(OwnerProperty, value); }
+            get { return _owner; }
+            set { SetAndRaise(OwnerProperty, ref _owner, value); }
         }
 
         /// <summary>