|
|
@@ -9,6 +9,7 @@
|
|
|
#import "FLEXExplorerToolbar.h"
|
|
|
#import "FLEXToolbarItem.h"
|
|
|
#import "FLEXResources.h"
|
|
|
+#import "FLEXUtility.h"
|
|
|
|
|
|
@interface FLEXExplorerToolbar ()
|
|
|
|
|
|
@@ -98,8 +99,8 @@
|
|
|
const CGFloat kToolbarItemHeight = [[self class] toolbarItemHeight];
|
|
|
self.dragHandle.frame = CGRectMake(self.bounds.origin.x, self.bounds.origin.y, [[self class] dragHandleWidth], kToolbarItemHeight);
|
|
|
CGRect dragHandleImageFrame = self.dragHandleImageView.frame;
|
|
|
- dragHandleImageFrame.origin.x = floor((self.dragHandle.frame.size.width - dragHandleImageFrame.size.width) / 2.0);
|
|
|
- dragHandleImageFrame.origin.y = floor((self.dragHandle.frame.size.height - dragHandleImageFrame.size.height) / 2.0);
|
|
|
+ dragHandleImageFrame.origin.x = FLEXFloor((self.dragHandle.frame.size.width - dragHandleImageFrame.size.width) / 2.0);
|
|
|
+ dragHandleImageFrame.origin.y = FLEXFloor((self.dragHandle.frame.size.height - dragHandleImageFrame.size.height) / 2.0);
|
|
|
self.dragHandleImageView.frame = dragHandleImageFrame;
|
|
|
|
|
|
|
|
|
@@ -107,7 +108,7 @@
|
|
|
CGFloat originX = CGRectGetMaxX(self.dragHandle.frame);
|
|
|
CGFloat originY = self.bounds.origin.y;
|
|
|
CGFloat height = kToolbarItemHeight;
|
|
|
- CGFloat width = floor((CGRectGetMaxX(self.bounds) - originX) / [self.toolbarItems count]);
|
|
|
+ CGFloat width = FLEXFloor((CGRectGetMaxX(self.bounds) - originX) / [self.toolbarItems count]);
|
|
|
for (UIView *toolbarItem in self.toolbarItems) {
|
|
|
toolbarItem.frame = CGRectMake(originX, originY, width, height);
|
|
|
originX = CGRectGetMaxX(toolbarItem.frame);
|
|
|
@@ -136,7 +137,7 @@
|
|
|
selectedViewColorFrame.size.width = kSelectedViewColorDiameter;
|
|
|
selectedViewColorFrame.size.height = kSelectedViewColorDiameter;
|
|
|
selectedViewColorFrame.origin.x = kHorizontalPadding;
|
|
|
- selectedViewColorFrame.origin.y = floor((kDescriptionContainerHeight - kSelectedViewColorDiameter) / 2.0);
|
|
|
+ selectedViewColorFrame.origin.y = FLEXFloor((kDescriptionContainerHeight - kSelectedViewColorDiameter) / 2.0);
|
|
|
self.selectedViewColorIndicator.frame = selectedViewColorFrame;
|
|
|
self.selectedViewColorIndicator.layer.cornerRadius = ceil(selectedViewColorFrame.size.height / 2.0);
|
|
|
|