- Update task progress spinner to draw on the main thread rather than a background thread; should fix a number of issues logged by the crash reporter

 - Update indicator code to merged master incorporating our changes, reworked and improved

1 files changed, 19 insertions, 8 deletions

diff --git a/Source/YRKSpinningProgressIndicator.h b/Source/YRKSpinningProgressIndicator.h
index 355ebf2f..178551b9 100644
--- a/Source/YRKSpinningProgressIndicator.h
+++ b/Source/YRKSpinningProgressIndicator.h
@@ -11,35 +11,46 @@
     NSInteger _position;
     NSInteger _numFins;
 
-	BOOL _isIndeterminate;
-	double _currentValue;
-	double _maxValue;
-
     BOOL _isAnimating;
+    NSTimer *_animationTimer;
 	NSThread *_animationThread;
 
     NSColor *_foreColor;
     NSColor *_backColor;
     BOOL _drawBackground;
+    
+    NSTimer *_fadeOutAnimationTimer;
+    BOOL _isFadingOut;
+    
+    // For determinate mode
+    BOOL _isIndeterminate;
+    double _currentValue;
+    double _maxValue;
+    
+    BOOL _usesThreadedAnimation;
 }
-- (void)animate:(id)sender;
+
 - (void)stopAnimation:(id)sender;
 - (void)startAnimation:(id)sender;
 
+
+// Accessors
+
 - (NSColor *)foreColor;
 - (void)setForeColor:(NSColor *)value;
-
 - (NSColor *)backColor;
 - (void)setBackColor:(NSColor *)value;
-
 - (BOOL)drawBackground;
 - (void)setDrawBackground:(BOOL)value;
 
 - (BOOL)isIndeterminate;
 - (void)setIndeterminate:(BOOL)isIndeterminate;
-
 - (double)doubleValue;
 - (void)setDoubleValue:(double)doubleValue;
 - (double)maxValue;
 - (void)setMaxValue:(double)maxValue;
+
+- (void)setUsesThreadedAnimation:(BOOL)useThreaded;
+- (BOOL)usesThreadedAnimation;
+
 @end