From 02ebded6a227481bde5347d5fc49ae1e2b6cde0d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 31 Aug 2019 18:25:23 +0200
Subject: [PATCH] Don't bring hidden controls into view.

---
 src/Avalonia.Controls/ControlExtensions.cs        | 15 +++++++++------
 .../Presenters/ScrollContentPresenter.cs          |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Controls/ControlExtensions.cs b/src/Avalonia.Controls/ControlExtensions.cs
index 2fccb15acc..3bd222d132 100644
--- a/src/Avalonia.Controls/ControlExtensions.cs
+++ b/src/Avalonia.Controls/ControlExtensions.cs
@@ -34,14 +34,17 @@ namespace Avalonia.Controls
         {
             Contract.Requires<ArgumentNullException>(control != null);
 
-            var ev = new RequestBringIntoViewEventArgs
+            if (control.IsEffectivelyVisible)
             {
-                RoutedEvent = Control.RequestBringIntoViewEvent,
-                TargetObject = control,
-                TargetRect = rect,
-            };
+                var ev = new RequestBringIntoViewEventArgs
+                {
+                    RoutedEvent = Control.RequestBringIntoViewEvent,
+                    TargetObject = control,
+                    TargetRect = rect,
+                };
 
-            control.RaiseEvent(ev);
+                control.RaiseEvent(ev);
+            }
         }
 
         /// <summary>
diff --git a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
index e7d8018a42..ec6a228421 100644
--- a/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs
@@ -141,7 +141,7 @@ namespace Avalonia.Controls.Presenters
         /// <returns>True if the scroll offset was changed; otherwise false.</returns>
         public bool BringDescendantIntoView(IVisual target, Rect targetRect)
         {
-            if (Child == null)
+            if (Child?.IsEffectivelyVisible != true)
             {
                 return false;
             }