From ff0ae960808fe52b422fc0fc0bcb89526a68a327 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Thu, 30 May 2019 21:56:08 +0800
Subject: [PATCH] Fix shared size scope handlers. 5/9 unit tests on
 SharedSizeScopeTests now works.

---
 src/Avalonia.Controls/DefinitionBase.cs | 2 +-
 src/Avalonia.Controls/Grid.cs           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/DefinitionBase.cs b/src/Avalonia.Controls/DefinitionBase.cs
index 3d1a5f0e79..e0ed8aa7d7 100644
--- a/src/Avalonia.Controls/DefinitionBase.cs
+++ b/src/Avalonia.Controls/DefinitionBase.cs
@@ -939,7 +939,7 @@ namespace Avalonia.Controls
         static DefinitionBase()
         {
             SharedSizeGroupProperty.Changed.AddClassHandler<DefinitionBase>(OnSharedSizeGroupPropertyChanged);
-            PrivateSharedSizeScopeProperty.Changed.AddClassHandler<Control>(OnPrivateSharedSizeScopePropertyChanged);
+            PrivateSharedSizeScopeProperty.Changed.AddClassHandler<DefinitionBase>(OnPrivateSharedSizeScopePropertyChanged);
         }
 
         #endregion Properties
diff --git a/src/Avalonia.Controls/Grid.cs b/src/Avalonia.Controls/Grid.cs
index 1d9251076d..891e36da08 100644
--- a/src/Avalonia.Controls/Grid.cs
+++ b/src/Avalonia.Controls/Grid.cs
@@ -30,6 +30,7 @@ namespace Avalonia.Controls
 
         static Grid()
         {
+            IsSharedSizeScopeProperty.Changed.AddClassHandler<Control>(DefinitionBase.OnIsSharedSizeScopePropertyChanged);
             ShowGridLinesProperty.Changed.AddClassHandler<Grid>(OnShowGridLinesPropertyChanged);
             ColumnProperty.Changed.AddClassHandler<Grid>(OnCellAttachedPropertyChanged);
             ColumnSpanProperty.Changed.AddClassHandler<Grid>(OnCellAttachedPropertyChanged);