From 6f286375cafe4ce24b082d58766bfc6f64562b25 Mon Sep 17 00:00:00 2001 From: nick-iqnect Date: Thu, 4 Dec 2014 18:11:51 +0800 Subject: [PATCH] Fix merge conflict --- .../WKPagesCollectionView/WKPagesCollectionViewCell.m | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/WKPagesScrollView/WKPagesCollectionView/WKPagesCollectionViewCell.m b/WKPagesScrollView/WKPagesCollectionView/WKPagesCollectionViewCell.m index 668f8dc..41f09ba 100644 --- a/WKPagesScrollView/WKPagesCollectionView/WKPagesCollectionViewCell.m +++ b/WKPagesScrollView/WKPagesCollectionView/WKPagesCollectionViewCell.m @@ -11,6 +11,7 @@ #import "WKCloseButton.h" #define CloseButtonWidth 35 #define CloseButtonHeight CloseButtonWidth * 1.5 +#define HighLightRotateAngle -10.0f @implementation WKPagesCollectionViewCell @dynamic showingState; - (id)initWithFrame:(CGRect)frame @@ -116,16 +117,18 @@ -(void)setShowingState:(WKPagesCollectionViewCellShowingState)showingState{ self.normalTransform=self.layer.transform;///The original location of the first record _scrollView.scrollEnabled=NO; _closeButton.hidden = NO; + CATransform3D rotateTransform=WKFlipCATransform3DPerspectSimpleWithRotate(HighLightRotateAngle); CATransform3D moveTransform=CATransform3DMakeTranslation(0, -1*pageHeight-topMargin, 0); - self.layer.transform=CATransform3DConcat(CATransform3DIdentity, moveTransform); + self.layer.transform=CATransform3DConcat(rotateTransform, moveTransform); } break; case WKPagesCollectionViewCellShowingStateBackToBottom:{ self.normalTransform=self.layer.transform;///The original location of the first record _scrollView.scrollEnabled=NO; _closeButton.hidden = NO; + CATransform3D rotateTransform=WKFlipCATransform3DPerspectSimpleWithRotate(HighLightRotateAngle); CATransform3D moveTransform=CATransform3DMakeTranslation(0, pageHeight+topMargin, 0); - self.layer.transform=CATransform3DConcat(CATransform3DIdentity, moveTransform); + self.layer.transform=CATransform3DConcat(rotateTransform, moveTransform); } break; case WKPagesCollectionViewCellShowingStateNormal:{