瀏覽代碼

Add inheritance parent to DefBase.

Jumar Macato 6 年之前
父節點
當前提交
7e16a9032a
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      src/Avalonia.Controls/DefinitionBase.cs

+ 3 - 3
src/Avalonia.Controls/DefinitionBase.cs

@@ -68,6 +68,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// </summary>
         internal void OnEnterParentTree()
         internal void OnEnterParentTree()
         {
         {
+            this.InheritanceParent = Parent;
             if (_sharedState == null)
             if (_sharedState == null)
             {
             {
                 //  start with getting SharedSizeGroup value. 
                 //  start with getting SharedSizeGroup value. 
@@ -87,7 +88,7 @@ namespace Avalonia.Controls
 
 
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
         {
         {
-            if(e.Property.PropertyType == typeof(GridLength)
+            if (e.Property.PropertyType == typeof(GridLength)
              || e.Property.PropertyType == typeof(double))
              || e.Property.PropertyType == typeof(double))
                 OnUserSizePropertyChanged(e);
                 OnUserSizePropertyChanged(e);
                 
                 
@@ -165,7 +166,6 @@ namespace Avalonia.Controls
                 }
                 }
             }
             }
         }
         }
-        
         /// <summary>
         /// <summary>
         /// <see cref="AvaloniaProperty.ValidateValueCallback"/>
         /// <see cref="AvaloniaProperty.ValidateValueCallback"/>
         /// </summary>
         /// </summary>
@@ -939,7 +939,7 @@ namespace Avalonia.Controls
         static DefinitionBase()
         static DefinitionBase()
         {
         {
             SharedSizeGroupProperty.Changed.AddClassHandler<DefinitionBase>(OnSharedSizeGroupPropertyChanged);
             SharedSizeGroupProperty.Changed.AddClassHandler<DefinitionBase>(OnSharedSizeGroupPropertyChanged);
-            PrivateSharedSizeScopeProperty.Changed.AddClassHandler<DefinitionBase>(OnPrivateSharedSizeScopePropertyChanged);
+            PrivateSharedSizeScopeProperty.Changed.AddClassHandler<Control>(OnPrivateSharedSizeScopePropertyChanged);
         }
         }
 
 
         #endregion Properties
         #endregion Properties