Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #102 from aidansteele/master

A couple of changes to make fussy compilers happy
  • Loading branch information...
commit f962a7d681324a2f649d54f28324acccd71facab 2 parents 9325d4d + 6d23e82
@Inferis authored
Showing with 2 additions and 2 deletions.
  1. +1 −1  ViewDeck/IIViewDeckController.m
  2. +1 −1  ViewDeck/WrapController.m
View
2  ViewDeck/IIViewDeckController.m
@@ -1099,7 +1099,7 @@ - (CGFloat)locationOfPanner:(UIPanGestureRecognizer*)panner {
if (!self.rightController) x = MAX(0, x);
CGFloat w = self.referenceBounds.size.width;
- CGFloat lx = MAX(MIN(x, w-self.leftLedge), -w+self.rightLedge);
+ CGFloat lx = fmaxf(fminf(x, w-self.leftLedge), -w+self.rightLedge);
if (self.elastic) {
CGFloat dx = ABS(x) - ABS(lx);
View
2  ViewDeck/WrapController.m
@@ -38,7 +38,7 @@
#endif
#define II_CGRectOffsetRightAndShrink(rect, offset) ({__typeof__(rect) __r = (rect); __typeof__(offset) __o = (offset); (CGRect) { __r.origin.x, __r.origin.y, __r.size.width-__o, __r.size.height }; })
-#define II_CGRectOffsetTopAndShrink(rect, offset) ({__typeof__(rect) __r = (rect); __typeof__(offset) __o = (offset); (CGRect) { __r.origin.x, __r.origin.y + __o, __r.size.width, __r.size.height-__o }; })
+#define II_CGRectOffsetTopAndShrink(rect, offset) ({__typeof__(rect) __r = (rect); __typeof__(offset) __o = (offset); (CGRect) {{ __r.origin.x, __r.origin.y + __o}, {__r.size.width, __r.size.height-__o }}; })
#define II_CGRectOffsetBottomAndShrink(rect, offset) ({__typeof__(rect) __r = (rect); __typeof__(offset) __o = (offset); (CGRect) { __r.origin.x, __r.origin.y, __r.size.width, __r.size.height-__o }; })
#define II_CGRectShrink(rect, w, h) ({__typeof__(rect) __r = (rect); __typeof__(w) __w = (w); __typeof__(h) __h = (h); (CGRect) { __r.origin, __r.size.width - __w, __r.size.height - __h }; })
Please sign in to comment.
Something went wrong with that request. Please try again.