From 498e19ba56391a8391c8fe1aaae016cb1caf3c8d Mon Sep 17 00:00:00 2001 From: Zongze Date: Thu, 21 Dec 2017 10:11:41 +0800 Subject: [PATCH 1/3] Fix bug in fontScale --- .../TYPagerController/TabPager/TYTabPagerBarLayout.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TYPagerControllerDemo/TYPagerController/TabPager/TYTabPagerBarLayout.m b/TYPagerControllerDemo/TYPagerController/TabPager/TYTabPagerBarLayout.m index d48b005..117226b 100644 --- a/TYPagerControllerDemo/TYPagerController/TabPager/TYTabPagerBarLayout.m +++ b/TYPagerControllerDemo/TYPagerController/TabPager/TYTabPagerBarLayout.m @@ -204,12 +204,12 @@ - (void)transitionFromCell:(UICollectionViewCell *)fr if (fromCell) { fromCell.titleLabel.font = _normalTextFont; fromCell.titleLabel.textColor = _normalTextColor; - fromCell.transform = CGAffineTransformMakeScale(_selectFontScale, _selectFontScale); + fromCell.transform = CGAffineTransformIdentity; } if (toCell) { toCell.titleLabel.font = _normalTextFont; toCell.titleLabel.textColor = _selectedTextColor ? _selectedTextColor : _normalTextColor; - toCell.transform = CGAffineTransformIdentity; + toCell.transform = CGAffineTransformMakeScale(1/_selectFontScale,1/ _selectFontScale); } }; if (animate) { From 94c73747a79694c4ddb9ad6728478b87bef32ea1 Mon Sep 17 00:00:00 2001 From: Zongze Date: Thu, 21 Dec 2017 18:30:43 +0800 Subject: [PATCH 2/3] Fix bug in transitionCell --- .../TabPager/TYTabPagerBarLayout.m | 6 +++--- .../UserInterfaceState.xcuserstate | Bin 0 -> 10614 bytes .../xcschemes/xcschememanagement.plist | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 TYPagerControllerDemo_swift.xcodeproj/project.xcworkspace/xcuserdata/sunset.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 TYPagerControllerDemo_swift.xcodeproj/xcuserdata/sunset.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/TYPagerControllerDemo/TYPagerController/TabPager/TYTabPagerBarLayout.m b/TYPagerControllerDemo/TYPagerController/TabPager/TYTabPagerBarLayout.m index 117226b..ae6ad81 100644 --- a/TYPagerControllerDemo/TYPagerController/TabPager/TYTabPagerBarLayout.m +++ b/TYPagerControllerDemo/TYPagerController/TabPager/TYTabPagerBarLayout.m @@ -226,9 +226,9 @@ - (void)transitionFromCell:(UICollectionViewCell *)fr if (_pagerTabBar.countOfItems == 0 || !_textColorProgressEnable) { return; } - CGFloat currentTransform = (1.0 - _selectFontScale)*progress; - fromCell.transform = CGAffineTransformMakeScale(1.0-currentTransform, 1.0-currentTransform); - toCell.transform = CGAffineTransformMakeScale(_selectFontScale+currentTransform, _selectFontScale+currentTransform); + + fromCell.transform = CGAffineTransformIdentity; + toCell.transform = CGAffineTransformIdentity; if (_normalTextColor == _selectedTextColor || !_selectedTextColor) { return; diff --git a/TYPagerControllerDemo_swift.xcodeproj/project.xcworkspace/xcuserdata/sunset.xcuserdatad/UserInterfaceState.xcuserstate b/TYPagerControllerDemo_swift.xcodeproj/project.xcworkspace/xcuserdata/sunset.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..9e2bcdfc0179a19bfaa4ef4e32eb7e257a920a6d GIT binary patch literal 10614 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 QB1F0}i=}Jqzw65X0bm9w5C8xG literal 0 HcmV?d00001 diff --git a/TYPagerControllerDemo_swift.xcodeproj/xcuserdata/sunset.xcuserdatad/xcschemes/xcschememanagement.plist b/TYPagerControllerDemo_swift.xcodeproj/xcuserdata/sunset.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..7653099 --- /dev/null +++ b/TYPagerControllerDemo_swift.xcodeproj/xcuserdata/sunset.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + TYPagerControllerDemo_swift.xcscheme + + orderHint + 0 + + + + From 5569120e2fd508e624248b6b3f3583d908d1f2b6 Mon Sep 17 00:00:00 2001 From: Zongze Date: Fri, 19 Jan 2018 15:45:15 +0800 Subject: [PATCH 3/3] Fix bug in tab font size --- .../TYPagerController/TabPager/TYTabPagerBarLayout.m | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/TYPagerControllerDemo/TYPagerController/TabPager/TYTabPagerBarLayout.m b/TYPagerControllerDemo/TYPagerController/TabPager/TYTabPagerBarLayout.m index ae6ad81..7c03242 100644 --- a/TYPagerControllerDemo/TYPagerController/TabPager/TYTabPagerBarLayout.m +++ b/TYPagerControllerDemo/TYPagerController/TabPager/TYTabPagerBarLayout.m @@ -227,8 +227,12 @@ - (void)transitionFromCell:(UICollectionViewCell *)fr return; } - fromCell.transform = CGAffineTransformIdentity; - toCell.transform = CGAffineTransformIdentity; + + // progress 0 --> 1 // from 1/_selectFontScale -> 1 + CGFloat scale1 = (1 - 1 / _selectFontScale) * progress + 1 / _selectFontScale; + CGFloat scale2 = (1 / _selectFontScale - 1) * progress + 1; + fromCell.transform = CGAffineTransformMakeScale(scale1, scale1 ); + toCell.transform = CGAffineTransformMakeScale(scale2, scale2) ; if (_normalTextColor == _selectedTextColor || !_selectedTextColor) { return;