added UIScrollView zoomScale

owenv · May 13, 2014 · e16a914 · e16a914
1 parent 4351b1d
commit e16a914
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/pop-tests/POPAnimatablePropertyTests.mm b/pop-tests/POPAnimatablePropertyTests.mm
@@ -58,6 +58,7 @@ - (void)testProvidedExistence
                      kPOPViewFrame,
                      kPOPViewBounds,
                      kPOPViewSize,
+                     kPOPScrollViewZoomScale,
                      kPOPTableViewContentSize,
                      kPOPTableViewContentOffset,
                      kPOPLabelTextColor

diff --git a/pop/POPAnimatableProperty.h b/pop/POPAnimatableProperty.h
@@ -150,6 +150,7 @@ extern NSString * const kPOPViewSize;
  */
 extern NSString * const kPOPScrollViewContentOffset;
 extern NSString * const kPOPScrollViewContentSize;
+extern NSString * const kPOPScrollViewZoomScale;
 
 /**
  Common UITableView property names.

diff --git a/pop/POPAnimatableProperty.mm b/pop/POPAnimatableProperty.mm
@@ -83,6 +83,7 @@
 // UIScrollView
 NSString * const kPOPScrollViewContentOffset = @"scrollView.contentOffset";
 NSString * const kPOPScrollViewContentSize = @"scrollView.contentSize";
+NSString * const kPOPScrollViewZoomScale = @"scrollView.zoomScale";
 
 // UITableView
 NSString * const kPOPTableViewContentOffset = kPOPScrollViewContentOffset;
@@ -550,6 +551,16 @@
     },
     kPOPThresholdPoint
   },
+
+  {kPOPScrollViewZoomScale,
+    ^(UIScrollView *obj, CGFloat values[]) {
+      values[0]=obj.zoomScale;
+    },
+    ^(UIScrollView *obj, const CGFloat values[]) {
+      obj.zoomScale=values[0];
+    },
+    kPOPThresholdScale
+  },
 
   /* UINavigationBar */