diff options
| author | kingces95 <kingces95@users.noreply.github.com> | 2017-04-11 14:02:06 -0400 |
|---|---|---|
| committer | Rui Marinho <me@ruimarinho.net> | 2017-04-11 19:02:06 +0100 |
| commit | 093a4efa2da9cb681890158ca8ee9bb6f30b0a8c (patch) | |
| tree | ccc17255876e40d2c845d7b2c62dfc930156729d /Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs | |
| parent | 7458ca37330f424bf7fb1447580b0fa9c34c6db4 (diff) | |
| download | xamarin-forms-093a4efa2da9cb681890158ca8ee9bb6f30b0a8c.tar.gz xamarin-forms-093a4efa2da9cb681890158ca8ee9bb6f30b0a8c.tar.bz2 xamarin-forms-093a4efa2da9cb681890158ca8ee9bb6f30b0a8c.zip | |
Implicit impl of controller ifaces (#807)
* Simplify ICtrl callsites
* Rebase fix
Diffstat (limited to 'Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs')
| -rw-r--r-- | Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs index 1fe2edbd..4001c3df 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs @@ -25,11 +25,6 @@ namespace Xamarin.Forms.Platform.iOS Scrolled += HandleScrolled; } - protected IScrollViewController Controller - { - get { return (IScrollViewController)Element; } - } - ScrollView ScrollView { get { return Element as ScrollView; } @@ -58,13 +53,13 @@ namespace Xamarin.Forms.Platform.iOS if (oldElement != null) { oldElement.PropertyChanged -= HandlePropertyChanged; - ((IScrollViewController)oldElement).ScrollToRequested -= OnScrollToRequested; + ((ScrollView)oldElement).ScrollToRequested -= OnScrollToRequested; } if (element != null) { element.PropertyChanged += HandlePropertyChanged; - ((IScrollViewController)element).ScrollToRequested += OnScrollToRequested; + ((ScrollView)element).ScrollToRequested += OnScrollToRequested; if (_packager == null) { _packager = new VisualElementPackager(this); @@ -175,7 +170,7 @@ namespace Xamarin.Forms.Platform.iOS void HandleScrollAnimationEnded(object sender, EventArgs e) { - Controller.SendScrollFinished(); + ScrollView.SendScrollFinished(); } void HandleScrolled(object sender, EventArgs e) @@ -200,7 +195,7 @@ namespace Xamarin.Forms.Platform.iOS SetContentOffset(new PointF((nfloat)e.ScrollX, (nfloat)e.ScrollY), e.ShouldAnimate); else { - var positionOnScroll = Controller.GetScrollPositionForElement(e.Element as VisualElement, e.Position); + var positionOnScroll = ScrollView.GetScrollPositionForElement(e.Element as VisualElement, e.Position); positionOnScroll.X = positionOnScroll.X.Clamp(0, ContentSize.Width - Bounds.Size.Width); positionOnScroll.Y = positionOnScroll.Y.Clamp(0, ContentSize.Height - Bounds.Size.Height); @@ -219,7 +214,7 @@ namespace Xamarin.Forms.Platform.iOS } } if (!e.ShouldAnimate) - Controller.SendScrollFinished(); + ScrollView.SendScrollFinished(); } void UpdateDelaysContentTouches() @@ -242,7 +237,7 @@ namespace Xamarin.Forms.Platform.iOS void UpdateScrollPosition() { if (ScrollView != null) - Controller.SetScrolledPosition(ContentOffset.X, ContentOffset.Y); + ScrollView.SetScrolledPosition(ContentOffset.X, ContentOffset.Y); } void IEffectControlProvider.RegisterEffect(Effect effect) |