Skip to content
This repository has been archived by the owner on Apr 6, 2020. It is now read-only.

Fix typo #21

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix typo #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 18 additions & 18 deletions QBPopupMenu/QBPopupMenu.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ @interface QBPopupMenu ()
@property (nonatomic, assign) CGRect targetRect;

@property (nonatomic, assign) NSUInteger page;
@property (nonatomic, assign) QBPopupMenuArrowDirection actualArrorDirection;
@property (nonatomic, assign) QBPopupMenuArrowDirection actualArrowDirection;
@property (nonatomic, assign) CGPoint arrowPoint;

@property (nonatomic, strong) NSMutableArray *itemViews;
Expand Down Expand Up @@ -126,7 +126,7 @@ - (void)showInView:(UIView *)view targetRect:(CGRect)targetRect animated:(BOOL)a
}
}

self.actualArrorDirection = arrowDirection;
self.actualArrowDirection = arrowDirection;

// Calculate width
CGFloat maximumWidth = 0;
Expand Down Expand Up @@ -300,7 +300,7 @@ - (void)groupItemViewsWithMaximumWidth:(CGFloat)maximumWidth
// Create new array
NSMutableArray *itemViews = [NSMutableArray array];
CGFloat width = 0;
if (self.actualArrorDirection == QBPopupMenuArrowDirectionLeft || self.actualArrorDirection == QBPopupMenuArrowDirectionRight) {
if (self.actualArrowDirection == QBPopupMenuArrowDirectionLeft || self.actualArrowDirection == QBPopupMenuArrowDirectionRight) {
width += self.arrowSize;
}

Expand All @@ -316,7 +316,7 @@ - (void)groupItemViewsWithMaximumWidth:(CGFloat)maximumWidth
// Create new array
itemViews = [NSMutableArray array];
width = pagenatorWidth;
if (self.actualArrorDirection == QBPopupMenuArrowDirectionLeft || self.actualArrorDirection == QBPopupMenuArrowDirectionRight) {
if (self.actualArrowDirection == QBPopupMenuArrowDirectionLeft || self.actualArrowDirection == QBPopupMenuArrowDirectionRight) {
width += self.arrowSize;
}
}
Expand Down Expand Up @@ -370,7 +370,7 @@ - (void)updateVisibleItemViewsWithPage:(NSUInteger)page
- (void)layoutVisibleItemViews
{
CGFloat height = self.height;
if (self.actualArrorDirection == QBPopupMenuArrowDirectionDown || self.actualArrorDirection == QBPopupMenuArrowDirectionUp) {
if (self.actualArrowDirection == QBPopupMenuArrowDirectionDown || self.actualArrowDirection == QBPopupMenuArrowDirectionUp) {
height += self.arrowSize;
}

Expand All @@ -382,25 +382,25 @@ - (void)layoutVisibleItemViews
[self resetItemViewState:itemView];

// Set item view insets
if (i == 0 && self.actualArrorDirection == QBPopupMenuArrowDirectionLeft) {
if (i == 0 && self.actualArrowDirection == QBPopupMenuArrowDirectionLeft) {
itemView.button.contentEdgeInsets = UIEdgeInsetsMake(0, self.arrowSize, 0, 0);
}
else if (i == self.visibleItemViews.count - 1 && self.actualArrorDirection == QBPopupMenuArrowDirectionRight) {
else if (i == self.visibleItemViews.count - 1 && self.actualArrowDirection == QBPopupMenuArrowDirectionRight) {
itemView.button.contentEdgeInsets = UIEdgeInsetsMake(0, 0, 0, self.arrowSize);
}
else if (self.actualArrorDirection == QBPopupMenuArrowDirectionDown) {
else if (self.actualArrowDirection == QBPopupMenuArrowDirectionDown) {
itemView.button.contentEdgeInsets = UIEdgeInsetsMake(0, 0, self.arrowSize, 0);
}
else if (self.actualArrorDirection == QBPopupMenuArrowDirectionUp) {
else if (self.actualArrowDirection == QBPopupMenuArrowDirectionUp) {
itemView.button.contentEdgeInsets = UIEdgeInsetsMake(self.arrowSize, 0, 0, 0);
}

// Set item view frame
CGSize size = [itemView sizeThatFits:CGSizeZero];
CGFloat width = size.width;

if ((i == 0 && self.actualArrorDirection == QBPopupMenuArrowDirectionLeft) ||
(i == self.visibleItemViews.count - 1 && self.actualArrorDirection == QBPopupMenuArrowDirectionRight)) {
if ((i == 0 && self.actualArrowDirection == QBPopupMenuArrowDirectionLeft) ||
(i == self.visibleItemViews.count - 1 && self.actualArrowDirection == QBPopupMenuArrowDirectionRight)) {
width += self.arrowSize;
}

Expand All @@ -420,7 +420,7 @@ - (void)updatePopupMenuFrameAndArrowPosition
CGFloat width = itemView.frame.origin.x + itemView.frame.size.width;
CGFloat height = itemView.frame.origin.y + itemView.frame.size.height;

switch (self.actualArrorDirection) {
switch (self.actualArrowDirection) {
case QBPopupMenuArrowDirectionDown:
{
popupMenuFrame = CGRectMake(self.targetRect.origin.x + (self.targetRect.size.width - width) / 2.0,
Expand Down Expand Up @@ -553,7 +553,7 @@ - (UIImage *)popupMenuImageWithHighlighted:(BOOL)highlighted
UIGraphicsBeginImageContextWithOptions(self.bounds.size, NO, 0);

// Draw body
CGFloat y = (self.actualArrorDirection == QBPopupMenuArrowDirectionUp) ? self.arrowSize : 0;
CGFloat y = (self.actualArrowDirection == QBPopupMenuArrowDirectionUp) ? self.arrowSize : 0;
CGFloat height = self.height;

for (NSInteger i = 0; i < self.visibleItemViews.count; i++) {
Expand All @@ -565,12 +565,12 @@ - (UIImage *)popupMenuImageWithHighlighted:(BOOL)highlighted
CGRect headRect;
CGRect bodyRect;
CGRect tailRect;
if (self.actualArrorDirection == QBPopupMenuArrowDirectionLeft) {
if (self.actualArrowDirection == QBPopupMenuArrowDirectionLeft) {
headRect = CGRectMake(self.arrowSize, y, self.cornerRadius, height);
bodyRect = CGRectMake(self.arrowSize + self.cornerRadius, y, frame.size.width - (self.arrowSize + self.cornerRadius * 2.0), height);
tailRect = CGRectMake(frame.size.width - self.cornerRadius, y, self.cornerRadius, height);
}
else if (self.actualArrorDirection == QBPopupMenuArrowDirectionRight) {
else if (self.actualArrowDirection == QBPopupMenuArrowDirectionRight) {
headRect = CGRectMake(0, y, self.cornerRadius, height);
bodyRect = CGRectMake(self.cornerRadius, y, frame.size.width - (self.arrowSize + self.cornerRadius * 2.0), height);
tailRect = CGRectMake(frame.size.width - (self.arrowSize + self.cornerRadius), y, self.cornerRadius, height);
Expand All @@ -592,7 +592,7 @@ - (UIImage *)popupMenuImageWithHighlighted:(BOOL)highlighted
} else {
CGRect headRect;
CGRect bodyRect;
if (self.actualArrorDirection == QBPopupMenuArrowDirectionLeft) {
if (self.actualArrowDirection == QBPopupMenuArrowDirectionLeft) {
headRect = CGRectMake(self.arrowSize, y, self.cornerRadius, height);
bodyRect = CGRectMake(self.arrowSize + self.cornerRadius, y, frame.size.width - (self.arrowSize + self.cornerRadius), height);
} else {
Expand All @@ -610,7 +610,7 @@ - (UIImage *)popupMenuImageWithHighlighted:(BOOL)highlighted
else if (i == self.visibleItemViews.count - 1) {
CGRect bodyRect;
CGRect tailRect;
if (self.actualArrorDirection == QBPopupMenuArrowDirectionRight) {
if (self.actualArrowDirection == QBPopupMenuArrowDirectionRight) {
bodyRect = CGRectMake(frame.origin.x, y, frame.size.width - (self.cornerRadius + self.arrowSize), height);
tailRect = CGRectMake(frame.origin.x + frame.size.width - (self.cornerRadius + self.arrowSize), y, self.cornerRadius, height);
} else {
Expand All @@ -632,7 +632,7 @@ - (UIImage *)popupMenuImageWithHighlighted:(BOOL)highlighted
}

// Draw arrow
[self drawArrowAtPoint:self.arrowPoint arrowSize:self.arrowSize arrowDirection:self.actualArrorDirection highlighted:highlighted];
[self drawArrowAtPoint:self.arrowPoint arrowSize:self.arrowSize arrowDirection:self.actualArrowDirection highlighted:highlighted];

// Create image from buffer
UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
Expand Down