TouchInstinct
/
SKPhotoBrowser
307
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed issue when animatedFromView not has a superview but has superlayer

This commit is contained in:
Vahan 2016-07-25 12:05:58 +04:00
parent 28775b2672
commit 5a0cb8034a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SKPhotoBrowser/SKPhotoBrowser.swift
View File

@ -776,7 +776,11 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
backgroundView.alpha = 0
if let sender = delegate?.viewForPhoto?(self, index: initialPageIndex) ?? senderViewForAnimation {
senderViewOriginalFrame = (sender.superview?.convertRect(sender.frame, toView:nil))!
if let senderViewOriginalFrameTemp = sender.superview?.convertRect(sender.frame, toView:nil) {
senderViewOriginalFrame = senderViewOriginalFrameTemp
} else if let senderViewOriginalFrameTemp = sender.layer.superlayer?.convertRect(sender.frame, toLayer: nil) {
senderViewOriginalFrame = senderViewOriginalFrameTemp
}
sender.hidden = true
let imageFromView = (senderOriginImage ?? getImageFromView(sender)).rotateImageByOrientation()
@ -872,7 +876,11 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate {
setNeedsStatusBarAppearanceUpdate()
if let sender = senderViewForAnimation {
senderViewOriginalFrame = (sender.superview?.convertRect(sender.frame, toView:nil))!
if let senderViewOriginalFrameTemp = sender.superview?.convertRect(sender.frame, toView:nil) {
senderViewOriginalFrame = senderViewOriginalFrameTemp
} else if let senderViewOriginalFrameTemp = sender.layer.superlayer?.convertRect(sender.frame, toLayer: nil) {
senderViewOriginalFrame = senderViewOriginalFrameTemp
}
}
let contentOffset = scrollView.contentOffset