From 958d7833c4c36bed8abb1fbb5f8e852a3225a9c5 Mon Sep 17 00:00:00 2001 From: Jack Date: Wed, 11 Feb 2015 21:10:47 +0800 Subject: [PATCH] Fix the title label position bug in iPhone6 and iPhone6 Plug. --- XHTwitterPaggingViewer/Views/XHPaggingNavbar.m | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/XHTwitterPaggingViewer/Views/XHPaggingNavbar.m b/XHTwitterPaggingViewer/Views/XHPaggingNavbar.m index e973f5a..b53c7b0 100644 --- a/XHTwitterPaggingViewer/Views/XHPaggingNavbar.m +++ b/XHTwitterPaggingViewer/Views/XHPaggingNavbar.m @@ -14,7 +14,11 @@ #define kXHLabelBaseTag 1000 -@interface XHPaggingNavbar () +#define kXHRadie 3.2 + +@interface XHPaggingNavbar () { + CGFloat _mainScreenWidth; +} /** * 分页指示器 @@ -42,7 +46,7 @@ - (void)reloadData { }]; [self.titles enumerateObjectsUsingBlock:^(NSString *title, NSUInteger idx, BOOL *stop) { - CGRect titleLabelFrame = CGRectMake((idx * (kXHiPad ? 240 : 100)), 8, CGRectGetWidth(self.bounds), 20); + CGRect titleLabelFrame = CGRectMake((idx * (kXHiPad ? 240 : _mainScreenWidth / kXHRadie)), 8, CGRectGetWidth(self.bounds), 20); NSInteger tag = kXHLabelBaseTag + idx; UILabel *titleLabel = (UILabel *)[self viewWithTag: tag]; if (!titleLabel) { @@ -94,7 +98,7 @@ - (void)setContentOffset:(CGPoint)contentOffset { // frame CGRect titleLabelFrame = titleLabel.frame; - titleLabelFrame.origin.x = (idx * (kXHiPad ? 240 : 100)) - xOffset / 3.2; + titleLabelFrame.origin.x = (idx * (kXHiPad ? 240 : _mainScreenWidth / kXHRadie)) - xOffset / kXHRadie; titleLabel.frame = titleLabelFrame; // alpha @@ -137,6 +141,8 @@ - (id)initWithFrame:(CGRect)frame { if (self) { // Initialization code self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; + _mainScreenWidth = [[UIScreen mainScreen] bounds].size.width; + [self addSubview:self.pageControl]; } return self;