From 36cec4a51ffe31d208654d919314f441b1890bfd Mon Sep 17 00:00:00 2001 From: Tobi Adebisi Date: Thu, 14 Apr 2016 14:49:34 -0400 Subject: [PATCH 1/2] Update fill mode --- src/tiled/TilingScrollView.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tiled/TilingScrollView.swift b/src/tiled/TilingScrollView.swift index 20b8bdf..e2152bb 100644 --- a/src/tiled/TilingScrollView.swift +++ b/src/tiled/TilingScrollView.swift @@ -15,6 +15,7 @@ public protocol TilingScrollViewDataSource { func sizeOfTilesInTilingScrollView(tilingScrollView: TilingScrollView) -> CGSize } +@IBDesignable public class TilingScrollView: UIScrollView, UIScrollViewDelegate, TilingViewDataSource { private var pointToCenterAfterResize: CGPoint! @@ -67,7 +68,8 @@ public class TilingScrollView: UIScrollView, UIScrollViewDelegate, TilingViewDat public var imageView: TilingImageView! // hold thumbnail - var fillMode: Bool = false + @IBInspectable + public var fillMode: Bool = false var widthIsCropped: Bool = false var tilingEnabled: Bool = true { From 27e0a9a52bdc1db9fc5d56ad227098d59a6d9a8f Mon Sep 17 00:00:00 2001 From: Tobi Adebisi Date: Tue, 19 Apr 2016 16:37:40 -0400 Subject: [PATCH 2/2] Update to use animated parameter --- src/tiled/TilingScrollView.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tiled/TilingScrollView.swift b/src/tiled/TilingScrollView.swift index e2152bb..a73c9d8 100644 --- a/src/tiled/TilingScrollView.swift +++ b/src/tiled/TilingScrollView.swift @@ -141,9 +141,9 @@ public class TilingScrollView: UIScrollView, UIScrollViewDelegate, TilingViewDat let zoomScale = min(maximumZoomScale, min(zoomScaleX, zoomScaleY)) if !zoomOutWhenZoomedIn || fabs(self.zoomScale - zoomScale) > fabs(self.zoomScale - minimumZoomScale) { - zoomToRect(zoomRect, animated: true) + zoomToRect(zoomRect, animated: animated) } else { - setZoomScale(minimumZoomScale, animated: true) + setZoomScale(minimumZoomScale, animated: animated) } }