Merge branch 'combination'. [common]

cbpowell · Apr 13, 2016 · 26db256 · 26db256
2 parents 4fd215a + 10fd623
commit 26db256
Show file tree

Hide file tree

Showing 94 changed files with 5,344 additions and 736 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,11 +8,15 @@ MarqueeLabelDemo/build/*
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-*.xcworkspace
-!default.xcworkspace
 xcuserdata
 profile
 *.moved-aside
+*.xccheckout
+*.moved-aside
+*.xcuserstate
 
 # Exclude OS X folder attributes
-.DS_Store
+.DS_Store
+
+# Excluse Carthage build artifacts
+Carthage
diff --git a/MarqueeLabel.h → Classes/ObjC/MarqueeLabel.h b/MarqueeLabel.h → Classes/ObjC/MarqueeLabel.h
diff --git a/MarqueeLabel.m → Classes/ObjC/MarqueeLabel.m b/MarqueeLabel.m → Classes/ObjC/MarqueeLabel.m
@@ -215,6 +215,7 @@ - (void)setupLabel {
     [self addSubview:self.subLabel];
 
     // Setup default values
+    _marqueeType = MLContinuous;
     _awayOffset = 0.0f;
     _animationCurve = UIViewAnimationOptionCurveLinear;
     _labelize = NO;
@@ -458,7 +459,8 @@ - (BOOL)labelShouldScroll {
     }
 
     BOOL labelTooLarge = ([self subLabelSize].width + self.leadingBuffer > self.bounds.size.width);
-    return (!self.labelize && labelTooLarge);
+    BOOL animationHasDuration = (self.scrollDuration > 0.0f || self.rate > 0.0f);
+    return (!self.labelize && labelTooLarge && animationHasDuration);
 }
 
 - (BOOL)labelReadyForScroll {