Fixed a redundant check that caused a massive slowdown on UWP. (#788)

* Fixed a redundant check that caused a massive slowdown on UWP.

* Fixed formatting.

* Fixed formatting.

* UWP_UI_Speed_Fix Last time on tabbing, lets hope so!

diff --git a/Xamarin.Forms.Core/VisualElement.cs b/Xamarin.Forms.Core/VisualElement.cs
index 476a057..905771c 100644 (file)
--- a/Xamarin.Forms.Core/VisualElement.cs
+++ b/Xamarin.Forms.Core/VisualElement.cs
@@ -337,12 +337,11 @@ namespace Xamarin.Forms
                                        return true;
 
                                Element parent = RealParent;
-                               while (parent != null)
+                               if (parent != null)
                                {
                                        var visualElement = parent as VisualElement;
                                        if (visualElement != null && visualElement.IsInNativeLayout)
                                                return true;
-                                       parent = parent.RealParent;
                                }
 
                                return false;

diff --git a/Xamarin.Forms.Platform.WP8/VisualElementTracker.cs b/Xamarin.Forms.Platform.WP8/VisualElementTracker.cs
index b206af5..509ffd4 100644 (file)
--- a/Xamarin.Forms.Platform.WP8/VisualElementTracker.cs
+++ b/Xamarin.Forms.Platform.WP8/VisualElementTracker.cs
@@ -275,6 +275,7 @@ namespace Xamarin.Forms.Platform.WinPhone
                {
                        if (Model.IsInNativeLayout)
                                return;
+
                        var parent = (FrameworkElement)Element.Parent;
                        parent?.InvalidateMeasure();
                        Element.InvalidateMeasure();

diff --git a/Xamarin.Forms.Platform.WinRT/VisualElementTracker.cs b/Xamarin.Forms.Platform.WinRT/VisualElementTracker.cs
index e8684ff..a29d61a 100644 (file)
--- a/Xamarin.Forms.Platform.WinRT/VisualElementTracker.cs
+++ b/Xamarin.Forms.Platform.WinRT/VisualElementTracker.cs
@@ -275,6 +275,7 @@ namespace Xamarin.Forms.Platform.WinRT
                {
                        if (Element.IsInNativeLayout)
                                return;
+
                        var parent = (FrameworkElement)Container.Parent;
                        parent?.InvalidateMeasure();
                        Container.InvalidateMeasure();