Skip to content

Handle vertical center #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AnkitSimform wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Handle vertical center #347

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2aea5eb
remove roundf for unpredictable result
AnkitSimform Mar 20, 2020
4f65003
Merge pull request #1 from AnkitSimform/feature/vertical-center
AnkitSimform Mar 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions HMSegmentedControl/HMSegmentedControl.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,6 @@ - (CGSize)measureTitleAtIndex:(NSUInteger)index {
if ([title isKindOfClass:[NSString class]] && !self.titleFormatter) {
NSDictionary *titleAttrs = selected ? [self resultingSelectedTitleTextAttributes] : [self resultingTitleTextAttributes];
size = [(NSString *)title sizeWithAttributes:titleAttrs];
UIFont *font = titleAttrs[@"NSFont"];
size = CGSizeMake(ceil(size.width), ceil(size.height-font.descender));
} else if ([title isKindOfClass:[NSString class]] && self.titleFormatter) {
size = [self.titleFormatter(self, title, index, selected) size];
} else if ([title isKindOfClass:[NSAttributedString class]]) {
Expand Down Expand Up @@ -323,7 +321,7 @@ - (void)drawRect:(CGRect)rect {
BOOL locationUp = (self.selectionIndicatorLocation == HMSegmentedControlSelectionIndicatorLocationUp);
BOOL selectionStyleNotBox = (self.selectionStyle != HMSegmentedControlSelectionStyleBox);

CGFloat y = roundf((CGRectGetHeight(self.frame) - selectionStyleNotBox * self.selectionIndicatorHeight) / 2 - stringHeight / 2 + self.selectionIndicatorHeight * locationUp);
CGFloat y = (CGRectGetHeight(self.frame) - selectionStyleNotBox * self.selectionIndicatorHeight) / 2 - stringHeight / 2 + self.selectionIndicatorHeight * locationUp;
CGRect rect;
if (self.segmentWidthStyle == HMSegmentedControlSegmentWidthStyleFixed) {
rect = CGRectMake((self.segmentWidth * idx) + (self.segmentWidth - stringWidth) / 2, y, stringWidth, stringHeight);
Expand Down