Merge branch 'jake' into loader

2026-09-22 18:30:43 +00:00 · 2010-01-30 18:09:17 -08:00
parent ca5dd0071c ac68d670a2
commit 238d8ff0be
6 changed files with 7 additions and 1 deletions
@@ -427,7 +427,13 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
        CPProgressIndicatorStyleIdentifiers[_style],
        _CPControlIdentifierForControlSize(_controlSize))];

-    [_barView setFrameSize:CGSizeMake(CGRectGetWidth([self bounds]) * (_doubleValue - _minValue) / (_maxValue - _minValue) - 4.0, 16.0)];
+    var width = CGRectGetWidth([self bounds]),
+        barWidth = width * ((_doubleValue - _minValue) / (_maxValue - _minValue));
+
+    if (barWidth > 0.0 && barWidth < 4.0)
+        barWidth = 4.0;
+
+    [_barView setFrameSize:CGSizeMake(barWidth, 16.0)];
 }

 /* @ignore */