windgithub
diff --git a/‎Coding_iOS/Controllers/Login/LoginViewController.m‎
Lines changed: 1 addition & 1 deletion b/‎Coding_iOS/Controllers/Login/LoginViewController.m‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Coding_iOS/Vendor/PopMenu/MenuButton.m‎
Lines changed: 1 addition & 0 deletions b/‎Coding_iOS/Vendor/PopMenu/MenuButton.m‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Coding_iOS/Vendor/PopMenu/PopMenu.m‎
Lines changed: 1 addition & 1 deletion b/‎Coding_iOS/Vendor/PopMenu/PopMenu.m‎
Lines changed: 1 addition & 1 deletion
@@ -118,7 +118,7 @@ - (UIImageView *)bgBlurredView{
 
         CGSize bgImageSize = bgImage.size, bgViewSize = bgView.frame.size;
         if (bgImageSize.width > bgViewSize.width && bgImageSize.height > bgViewSize.height) {
-            bgImage = [bgImage scaleToSize:[bgView doubleSizeOfFrame] usingMode:NYXResizeModeAspectFill];
+            bgImage = [bgImage scaleToSize:bgViewSize usingMode:NYXResizeModeAspectFill];
         }
         bgImage = [bgImage applyLightEffectAtFrame:CGRectMake(0, 0, bgImage.size.width, bgImage.size.height)];
         bgView.image = bgImage;
 
@@ -58,6 +58,7 @@ - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
 }
 
 - (void)popBegan{
+    [self pop_removeAllAnimations];
     // 播放缩放动画
     POPSpringAnimation *scaleAnimation = [POPSpringAnimation animation];
     scaleAnimation.springBounciness = 20;    // value between 0-20
 
@@ -262,7 +262,7 @@ - (void)initailzerAnimationWithToPostion:(CGRect)toRect formPostion:(CGRect)from
     springAnimation.removedOnCompletion = YES;
     springAnimation.beginTime = beginTime + CACurrentMediaTime();
 //    CGFloat springBounciness = 6 - beginTime * 2;
-    CGFloat springBounciness = 10;
+    CGFloat springBounciness = 6;
     springAnimation.springBounciness = springBounciness;    // value between 0-20
 
 //    CGFloat springSpeed = 6 - beginTime * 2;
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ - (UIImageView *)bgBlurredView{`
`118`	`118`
`119`	`119`	`CGSize bgImageSize = bgImage.size, bgViewSize = bgView.frame.size;`
`120`	`120`	`if (bgImageSize.width > bgViewSize.width && bgImageSize.height > bgViewSize.height) {`
`121`		`- bgImage = [bgImage scaleToSize:[bgView doubleSizeOfFrame] usingMode:NYXResizeModeAspectFill];`
	`121`	`+ bgImage = [bgImage scaleToSize:bgViewSize usingMode:NYXResizeModeAspectFill];`
`122`	`122`	`}`
`123`	`123`	`bgImage = [bgImage applyLightEffectAtFrame:CGRectMake(0, 0, bgImage.size.width, bgImage.size.height)];`
`124`	`124`	`bgView.image = bgImage;`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ - (void)touchesBegan:(NSSet )touches withEvent:(UIEvent )event {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`- (void)popBegan{`
	`61`	`+ [self pop_removeAllAnimations];`
`61`	`62`	`// 播放缩放动画`
`62`	`63`	`POPSpringAnimation *scaleAnimation = [POPSpringAnimation animation];`
`63`	`64`	`scaleAnimation.springBounciness = 20; // value between 0-20`