diff options
author | Kangho Hur <kangho.hur@samsung.com> | 2017-10-23 13:47:06 +0900 |
---|---|---|
committer | Kangho Hur <kangho.hur@samsung.com> | 2017-10-23 13:52:29 +0900 |
commit | db4c712c0b6aa849badb9ce6d557c0019e575d01 (patch) | |
tree | a1d051c629c7210e1e0f77c23156b274931d0117 /Xamarin.Forms.Platform.iOS | |
parent | 1a7c36737dcbe6b2fc516cb72d9f3921b18c324a (diff) | |
download | xamarin-forms-db4c712c0b6aa849badb9ce6d557c0019e575d01.tar.gz xamarin-forms-db4c712c0b6aa849badb9ce6d557c0019e575d01.tar.bz2 xamarin-forms-db4c712c0b6aa849badb9ce6d557c0019e575d01.zip |
force sync with upstream 2.4.0-sr2
Change-Id: I36f0de33d03e804afd17f7ab2c60ae6f435ec402
Diffstat (limited to 'Xamarin.Forms.Platform.iOS')
-rw-r--r-- | Xamarin.Forms.Platform.iOS/RendererPool.cs | 12 | ||||
-rw-r--r-- | Xamarin.Forms.Platform.iOS/VisualElementPackager.cs | 30 | ||||
-rw-r--r-- | Xamarin.Forms.Platform.iOS/VisualElementTracker.cs | 4 |
3 files changed, 16 insertions, 30 deletions
diff --git a/Xamarin.Forms.Platform.iOS/RendererPool.cs b/Xamarin.Forms.Platform.iOS/RendererPool.cs index e95148da..563201f0 100644 --- a/Xamarin.Forms.Platform.iOS/RendererPool.cs +++ b/Xamarin.Forms.Platform.iOS/RendererPool.cs @@ -108,14 +108,10 @@ namespace Xamarin.Forms.Platform.MacOS var child = logicalChild as VisualElement; if (child != null) { - if (CompressedLayout.GetIsHeadless(child)) { - child.IsPlatformEnabled = true; - FillChildrenWithRenderers(child); - } else { - var renderer = GetFreeRenderer(child) ?? Platform.CreateRenderer(child); - Platform.SetRenderer(child, renderer); - _parent.NativeView.AddSubview(renderer.NativeView); - } + var renderer = GetFreeRenderer(child) ?? Platform.CreateRenderer(child); + Platform.SetRenderer(child, renderer); + + _parent.NativeView.AddSubview(renderer.NativeView); } } } diff --git a/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs b/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs index 72ab654a..fa91cf6a 100644 --- a/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs +++ b/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs @@ -13,20 +13,16 @@ namespace Xamarin.Forms.Platform.MacOS bool _isDisposed; - IElementController ElementController => _element; + IElementController ElementController => Renderer.Element as IElementController; - public VisualElementPackager(IVisualElementRenderer renderer) : this(renderer, null) - { - } - - VisualElementPackager(IVisualElementRenderer renderer, VisualElement element) + public VisualElementPackager(IVisualElementRenderer renderer) { if (renderer == null) throw new ArgumentNullException(nameof(renderer)); Renderer = renderer; renderer.ElementChanged += OnRendererElementChanged; - SetElement(null, element ?? renderer.Element); + SetElement(null, renderer.Element); } protected IVisualElementRenderer Renderer { get; set; } @@ -69,22 +65,16 @@ namespace Xamarin.Forms.Platform.MacOS if (_isDisposed) return; - if (CompressedLayout.GetIsHeadless(view)) { - var packager = new VisualElementPackager(Renderer, view); - view.IsPlatformEnabled = true; - packager.Load(); - } else { - var viewRenderer = Platform.CreateRenderer(view); - Platform.SetRenderer(view, viewRenderer); + var viewRenderer = Platform.CreateRenderer(view); + Platform.SetRenderer(view, viewRenderer); - var uiview = Renderer.NativeView; - uiview.AddSubview(viewRenderer.NativeView); + var uiview = Renderer.NativeView; + uiview.AddSubview(viewRenderer.NativeView); - if (Renderer.ViewController != null && viewRenderer.ViewController != null) - Renderer.ViewController.AddChildViewController(viewRenderer.ViewController); + if (Renderer.ViewController != null && viewRenderer.ViewController != null) + Renderer.ViewController.AddChildViewController(viewRenderer.ViewController); - EnsureChildrenOrder(); - } + EnsureChildrenOrder(); } protected virtual void OnChildRemoved(VisualElement view) diff --git a/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs b/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs index 68625a32..5c84b991 100644 --- a/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs +++ b/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs @@ -138,8 +138,8 @@ namespace Xamarin.Forms.Platform.MacOS var scale = (float)view.Scale; var width = (float)view.Width; var height = (float)view.Height; - var x = (float)view.X + (float)CompressedLayout.GetHeadlessOffset(view).X; - var y = (float)view.Y + (float)CompressedLayout.GetHeadlessOffset(view).Y; + var x = (float)view.X; + var y = (float)view.Y; var opacity = (float)view.Opacity; var isVisible = view.IsVisible; |