Skip to content

Zoom to rect animated #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OlorunTobi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Zoom to rect animated #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36cec4a
Update fill mode
OlorunTobi Apr 14, 2016
efd29b9
Merge pull request #1 from OlorunTobi/update-fill-mode
OlorunTobi Apr 14, 2016
27e0a9a
Update to use animated parameter
OlorunTobi Apr 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/tiled/TilingScrollView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public protocol TilingScrollViewDataSource {
func sizeOfTilesInTilingScrollView(tilingScrollView: TilingScrollView) -> CGSize
}

@IBDesignable
public class TilingScrollView: UIScrollView, UIScrollViewDelegate, TilingViewDataSource {

private var pointToCenterAfterResize: CGPoint!
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -139,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)
}
}

Expand Down