From 7f2db66cdc9ec7635c0ccc2ea197e9a68c0c8217 Mon Sep 17 00:00:00 2001 From: Alexsandersky Date: Thu, 10 Mar 2016 11:21:20 +0400 Subject: [PATCH 1/2] some fix --- SKPhotoBrowser/SKPhotoBrowser.swift | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/SKPhotoBrowser/SKPhotoBrowser.swift b/SKPhotoBrowser/SKPhotoBrowser.swift index 9a98084..40fe739 100644 --- a/SKPhotoBrowser/SKPhotoBrowser.swift +++ b/SKPhotoBrowser/SKPhotoBrowser.swift @@ -276,13 +276,22 @@ public class SKPhotoBrowser: UIViewController, UIScrollViewDelegate { pagingScrollView.frame = frameForPagingScrollView() pagingScrollView.contentSize = contentSizeForPagingScrollView() - + //If we open the SKPhotoBrowser from CollectionView not the first image, we have one element in visiblepages and we should to take 0 element from visibleindex but that we should to use frame we should use currentPageIndex for frame's functions. if visiblePages.count > 0 { - let page = visiblePages[currentPageIndex] - page.frame = frameForPageAtIndex(currentPageIndex) - page.setMaxMinZoomScalesForCurrentBounds() - if page.captionView != nil { - page.captionView.frame = frameForCaptionView(page.captionView, index: currentPageIndex) + if visiblePages.count == 1 { + let page = visiblePages[0] + page.frame = frameForPageAtIndex(currentPageIndex) + page.setMaxMinZoomScalesForCurrentBounds() + if page.captionView != nil { + page.captionView.frame = frameForCaptionView(page.captionView, index: currentPageIndex) + } + } else { + let page = visiblePages[currentPageIndex] + page.frame = frameForPageAtIndex(currentPageIndex) + page.setMaxMinZoomScalesForCurrentBounds() + if page.captionView != nil { + page.captionView.frame = frameForCaptionView(page.captionView, index: currentPageIndex) + } } } From 69c6ca9136a42db143cfced125074d0b2b5e65cc Mon Sep 17 00:00:00 2001 From: Alexsandersky Date: Thu, 10 Mar 2016 11:27:59 +0400 Subject: [PATCH 2/2] Update pod spec --- SKPhotoBrowser.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SKPhotoBrowser.podspec b/SKPhotoBrowser.podspec index 4f25c0e..d5c0938 100644 --- a/SKPhotoBrowser.podspec +++ b/SKPhotoBrowser.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "SKPhotoBrowser" - s.version = "1.6.3" + s.version = "1.6.4" s.summary = "Simple PhotoBrowser/Viewer inspired by facebook, twitter photo browsers written by swift2.0." s.homepage = "https://github.com/suzuki-0000/SKPhotoBrowser" s.license = { :type => "MIT", :file => "LICENSE" }