Revert "Merge pull request #7555 from AvaloniaUI/fixes/7552-visibilit…

…y-layout-invalidation" This reverts commit 8a8deda.
AvaloniaUI · May 25, 2022 · 39ab03c · 39ab03c
1 parent a975408
commit 39ab03c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 116 deletions.
diff --git a/src/Avalonia.Layout/Layoutable.cs b/src/Avalonia.Layout/Layoutable.cs
@@ -141,6 +141,7 @@ public class Layoutable : Visual, ILayoutable
         static Layoutable()
         {
             AffectsMeasure<Layoutable>(
+                IsVisibleProperty,
                 WidthProperty,
                 HeightProperty,
                 MinWidthProperty,
@@ -780,25 +781,6 @@ protected virtual void OnMeasureInvalidated()
         {
         }
 
-        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-        {
-            base.OnPropertyChanged(change);
-
-            if (change.Property == IsVisibleProperty)
-            {
-                DesiredSize = default;
-
-                // All changes to visibility cause the parent element to be notified.
-                this.GetVisualParent<ILayoutable>()?.ChildDesiredSizeChanged(this);
-
-                // We only invalidate outselves when visibility is changed to true.
-                if (change.GetNewValue<bool>())
-                {
-                    InvalidateMeasure();
-                }
-            }
-        }
-
         /// <inheritdoc/>
         protected sealed override void OnVisualParentChanged(IVisual? oldParent, IVisual? newParent)
         {

diff --git a/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs
@@ -320,103 +320,6 @@ public void LayoutManager_LayoutUpdated_Is_Unsubscribed_When_Detached_From_Tree(
                 Times.Once);
         }
 
-        [Fact]
-        public void Making_Control_Invisible_Should_Invalidate_Parent_Measure()
-        {
-            Border child;
-            var target = new StackPanel
-            {
-                Children =
-                {
-                    (child = new Border
-                    {
-                        Width = 100,
-                    }),
-                }
-            };
-
-            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            target.Arrange(new Rect(target.DesiredSize));
-
-            Assert.True(target.IsMeasureValid);
-            Assert.True(target.IsArrangeValid);
-            Assert.True(child.IsMeasureValid);
-            Assert.True(child.IsArrangeValid);
-
-            child.IsVisible = false;
-
-            Assert.False(target.IsMeasureValid);
-            Assert.False(target.IsArrangeValid);
-            Assert.True(child.IsMeasureValid);
-            Assert.True(child.IsArrangeValid);
-        }
-
-        [Fact]
-        public void Making_Control_Visible_Should_Invalidate_Own_And_Parent_Measure()
-        {
-            Border child;
-            var target = new StackPanel
-            {
-                Children =
-                {
-                    (child = new Border
-                    {
-                        Width = 100,
-                        IsVisible = false,
-                    }),
-                }
-            };
-
-            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            target.Arrange(new Rect(target.DesiredSize));
-
-            Assert.True(target.IsMeasureValid);
-            Assert.True(target.IsArrangeValid);
-            Assert.True(child.IsMeasureValid);
-            Assert.False(child.IsArrangeValid);
-
-            child.IsVisible = true;
-
-            Assert.False(target.IsMeasureValid);
-            Assert.False(target.IsArrangeValid);
-            Assert.False(child.IsMeasureValid);
-            Assert.False(child.IsArrangeValid);
-        }
-
-        [Fact]
-        public void Measuring_Invisible_Control_Should_Not_Invalidate_Parent_Measure()
-        {
-            Border child;
-            var target = new StackPanel
-            {
-                Children =
-                {
-                    (child = new Border
-                    {
-                        Width = 100,
-                    }),
-                }
-            };
-
-            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            target.Arrange(new Rect(target.DesiredSize));
-
-            Assert.True(target.IsMeasureValid);
-            Assert.True(target.IsArrangeValid);
-            Assert.Equal(new Size(100, 0), child.DesiredSize);
-
-            child.IsVisible = false;
-            Assert.Equal(default, child.DesiredSize);
-
-            target.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            target.Arrange(new Rect(target.DesiredSize));
-            child.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-
-            Assert.True(target.IsMeasureValid);
-            Assert.True(target.IsArrangeValid);
-            Assert.Equal(default, child.DesiredSize);
-        }
-
         private class TestLayoutable : Layoutable
         {
             public Size ArrangeSize { get; private set; }