Skip to content

Commit e8949f8

Browse files
committed
Merge branch 'release/1.2.1'
2 parents 9104ba2 + 7b1b3cc commit e8949f8

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

ScrollStackController.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "ScrollStackController"
3-
s.version = "1.2.0"
3+
s.version = "1.2.1"
44
s.summary = "Create complex scrollable layout using UIViewController and simplify your code"
55
s.homepage = "https://github.com/malcommac/ScrollStackController"
66
s.license = { :type => "MIT", :file => "LICENSE" }

ScrollStackController.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@
623623
INFOPLIST_FILE = ScrollStackControllerDemo/Info.plist;
624624
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
625625
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
626-
MARKETING_VERSION = 1.2.0;
626+
MARKETING_VERSION = 1.2.1;
627627
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
628628
MTL_FAST_MATH = YES;
629629
PRODUCT_BUNDLE_IDENTIFIER = com.danielemargutti.ScrollStackControllerDemo;
@@ -651,7 +651,7 @@
651651
INFOPLIST_FILE = ScrollStackControllerDemo/Info.plist;
652652
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
653653
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
654-
MARKETING_VERSION = 1.2.0;
654+
MARKETING_VERSION = 1.2.1;
655655
MTL_FAST_MATH = YES;
656656
PRODUCT_BUNDLE_IDENTIFIER = com.danielemargutti.ScrollStackControllerDemo;
657657
PRODUCT_NAME = "$(TARGET_NAME)";

ScrollStackControllerDemo/ViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class ViewController: UIViewController, ScrollStackControllerDelegate {
103103
}
104104

105105
func scrollStackContentSizeDidChange(_ stackView: ScrollStack, from oldValue: CGSize, to newValue: CGSize) {
106-
// debugPrint("Content size did change from \(oldValue) to \(newValue)")
106+
// debugPrint("Content size did change from \(oldValue) to \(newValue)")
107107
}
108108

109109
}

Sources/ScrollStackController/ScrollStack.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ open class ScrollStack: UIScrollView, UIScrollViewDelegate {
5151
public static let defaultRowHighlightColor = UIColor(red: 0.85, green: 0.85, blue: 0.85, alpha: 1)
5252

5353
/// Cached content size for did change content size callback in scrollstack delegate.
54-
private var cachedContentSize: CGSize?
54+
private var cachedContentSize: CGSize = .zero
5555

5656
// MARK: Public Properties
5757

@@ -965,10 +965,9 @@ open class ScrollStack: UIScrollView, UIScrollViewDelegate {
965965

966966
stackDelegate.scrollStackDidUpdateLayout(self)
967967

968-
if let oldContentSize = cachedContentSize, oldContentSize != self.contentSize {
969-
stackDelegate.scrollStackContentSizeDidChange(self, from: oldContentSize, to: contentSize)
968+
if cachedContentSize != self.contentSize {
969+
stackDelegate.scrollStackContentSizeDidChange(self, from: cachedContentSize, to: contentSize)
970970
}
971-
972971
cachedContentSize = self.contentSize
973972
}
974973

0 commit comments

Comments
 (0)