@@ -10,16 +10,16 @@
@interface SPIDAppController : NSObject {
- NSViewAnimation *viewAnimation;
-
- IBOutlet NSProgressIndicator *progressIndicator;
- IBOutlet YRKSpinningProgressIndicator *turboFan;
- IBOutlet NSButton *piButton;
- IBOutlet NSButton *tfButton;
-
- IBOutlet NSColorWell *ftForegroundColor;
- IBOutlet NSColorWell *ftBackgroundColor;
- BOOL tfIsRunning, piIsRunning;
+ NSViewAnimation *viewAnimation;
+
+ IBOutlet NSProgressIndicator *progressIndicator;
+ IBOutlet YRKSpinningProgressIndicator *turboFan;
+ IBOutlet NSButton *piButton;
+ IBOutlet NSButton *tfButton;
+
+ IBOutlet NSColorWell *ftForegroundColor;
+ IBOutlet NSColorWell *ftBackgroundColor;
+ BOOL tfIsRunning, piIsRunning;
}
Code/SPIDAppController.h
@@ -11,62 +11,70 @@
@implementation SPIDAppController
--(id)init {
- self = [super init];
- if (self != nil) {
- piIsRunning = NO;
- tfIsRunning = NO;
- }
- return self;
+-(id)init
+{
+ self = [super init];
+ if (self != nil) {
+ piIsRunning = NO;
+ tfIsRunning = NO;
+ }
+ return self;
}
-- (void)applicationDidFinishLaunching:(NSNotification *)notification {
- [ftForegroundColor setColor:[NSColor grayColor]];
- [ftBackgroundColor setColor:[NSColor whiteColor]];
- [self changeForegroundColor:ftForegroundColor];
- [self changeBackgroundColor:ftBackgroundColor];
-
- [turboFan setDrawBackground:NO];
-
- //TEST: bezeled
- [progressIndicator setBezeled:YES];
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+ [ftForegroundColor setColor:[NSColor grayColor]];
+ [ftBackgroundColor setColor:[NSColor whiteColor]];
+ [self changeForegroundColor:ftForegroundColor];
+ [self changeBackgroundColor:ftBackgroundColor];
+
+ [turboFan setDrawBackground:NO];
+
+ //TEST: bezeled
+ [progressIndicator setBezeled:YES];
}
-- (IBAction)toggleProgressIndicator:(id)sender {
- if(piIsRunning) {
- [progressIndicator stopAnimation:self];
- piIsRunning = NO;
- }
- else {
- [progressIndicator startAnimation:self];
- piIsRunning = YES;
- }
+- (IBAction)toggleProgressIndicator:(id)sender
+{
+ if(piIsRunning) {
+ [progressIndicator stopAnimation:self];
+ piIsRunning = NO;
+ }
+ else {
+ [progressIndicator startAnimation:self];
+ piIsRunning = YES;
+ }
}
-- (IBAction)toggleTurboFan:(id)sender {
- if(tfIsRunning) {
- [turboFan stopAnimation:self];
- tfIsRunning = NO;
- }
- else {
- [turboFan startAnimation:self];
- tfIsRunning = YES;
- }
+- (IBAction)toggleTurboFan:(id)sender
+{
+ if(tfIsRunning) {
+ [turboFan stopAnimation:self];
+ tfIsRunning = NO;
+ }
+ else {
+ [turboFan startAnimation:self];
+ tfIsRunning = YES;
+ }
}
-- (IBAction)changeForegroundColor:(id)sender {
- [turboFan setForeColor:[sender color]];
+- (IBAction)changeForegroundColor:(id)sender
+{
+ [turboFan setForeColor:[sender color]];
}
-- (IBAction)changeBackgroundColor:(id)sender{
- [turboFan setBackColor:[sender color]];
+- (IBAction)changeBackgroundColor:(id)sender
+{
+ [turboFan setBackColor:[sender color]];
}
-- (IBAction)toggleDrawBackground:(id)sender {
- if([sender state] == NSOnState)
- [turboFan setDrawBackground:YES];
- else
- [turboFan setDrawBackground:NO];
+- (IBAction)toggleDrawBackground:(id)sender
+{
+ if([sender state] == NSOnState)
+ [turboFan setDrawBackground:YES];
+ else
+ [turboFan setDrawBackground:NO];
}
+
@end
Code/SPIDAppController.m
@@ -8,19 +8,19 @@
@interface YRKSpinningProgressIndicator : NSView {
- int _position;
- NSDate *_nextFrameUpdate;
+ int _position;
+ NSDate *_nextFrameUpdate;
int _numFins;
-
- BOOL _isAnimating;
+
+ BOOL _isAnimating;
NSTimer *_animationTimer;
-
- NSColor *_foreColor;
- NSColor *_backColor;
- BOOL _drawBackground;
-
- NSTimer *_fadeOutAnimationTimer;
- BOOL _isFadingOut;
+
+ NSColor *_foreColor;
+ NSColor *_backColor;
+ BOOL _drawBackground;
+
+ NSTimer *_fadeOutAnimationTimer;
+ BOOL _isFadingOut;
}
- (void)animate:(id)sender;
- (void)stopAnimation:(id)sender;
Code/YRKSpinningProgressIndicator.h
@@ -17,142 +17,150 @@
@implementation YRKSpinningProgressIndicator
-- (id)initWithFrame:(NSRect)frame {
+- (id)initWithFrame:(NSRect)frame
+{
self = [super initWithFrame:frame];
if (self) {
- _position = 0;
+ _position = 0;
_numFins = 12;
- _isAnimating = NO;
- _isFadingOut = NO;
- _nextFrameUpdate = [[NSDate date] retain];
+ _isAnimating = NO;
+ _isFadingOut = NO;
+ _nextFrameUpdate = [[NSDate date] retain];
}
return self;
}
- (void)viewDidMoveToWindow
{
- [super viewDidMoveToWindow];
-
- if ([self window] == nil) {
- // No window? View hierarchy may be going away. Dispose timer to clear circular retain of timer to self to timer.
- [self disposeAnimTimer];
- }
- else if (_isAnimating) {
- [self setupAnimTimer];
- }
+ [super viewDidMoveToWindow];
+
+ if ([self window] == nil) {
+ // No window? View hierarchy may be going away. Dispose timer to clear circular retain of timer to self to timer.
+ [self disposeAnimTimer];
+ }
+ else if (_isAnimating) {
+ [self setupAnimTimer];
+ }
}
-- (void)drawRect:(NSRect)rect {
- int i;
- float alpha = 1.0;
-
- // Determine size based on current bounds
- NSSize size = [self bounds].size;
- float maxSize;
- if(size.width >= size.height)
- maxSize = size.height;
- else
- maxSize = size.width;
-
- // fill the background, if set
- if(_drawBackground) {
- [_backColor set];
- [NSBezierPath fillRect:[self bounds]];
- }
-
- CGContextRef currentContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
- [NSGraphicsContext saveGraphicsState];
-
- // Move the CTM so 0,0 is at the center of our bounds
- CGContextTranslateCTM(currentContext,[self bounds].size.width/2,[self bounds].size.height/2);
-
- // do initial rotation to start place
- CGContextRotateCTM(currentContext, 3.14159*2/_numFins * _position);
-
- NSBezierPath *path = [[NSBezierPath alloc] init];
- float lineWidth = 0.0859375 * maxSize; // should be 2.75 for 32x32
- float lineStart = 0.234375 * maxSize; // should be 7.5 for 32x32
- float lineEnd = 0.421875 * maxSize; // should be 13.5 for 32x32
- [path setLineWidth:lineWidth];
- [path setLineCapStyle:NSRoundLineCapStyle];
- [path moveToPoint:NSMakePoint(0,lineStart)];
- [path lineToPoint:NSMakePoint(0,lineEnd)];
-
- for(i=0; i<_numFins; i++) {
- if(_isAnimating) {
- [[_foreColor colorWithAlphaComponent:alpha] set];
- }
- else {
- [[_foreColor colorWithAlphaComponent:0.2] set];
- }
-
- [path stroke];
-
- // we draw all the fins by rotating the CTM, then just redraw the same segment again
- CGContextRotateCTM(currentContext, 6.282185/_numFins);
- alpha -= 1.0/_numFins;
- }
- [path release];
-
- [NSGraphicsContext restoreGraphicsState];
+- (void)drawRect:(NSRect)rect
+{
+ int i;
+ float alpha = 1.0;
+
+ // Determine size based on current bounds
+ NSSize size = [self bounds].size;
+ float maxSize;
+ if(size.width >= size.height)
+ maxSize = size.height;
+ else
+ maxSize = size.width;
+
+ // fill the background, if set
+ if(_drawBackground) {
+ [_backColor set];
+ [NSBezierPath fillRect:[self bounds]];
+ }
+
+ CGContextRef currentContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
+ [NSGraphicsContext saveGraphicsState];
+
+ // Move the CTM so 0,0 is at the center of our bounds
+ CGContextTranslateCTM(currentContext,[self bounds].size.width/2,[self bounds].size.height/2);
+
+ // do initial rotation to start place
+ CGContextRotateCTM(currentContext, 3.14159*2/_numFins * _position);
+
+ NSBezierPath *path = [[NSBezierPath alloc] init];
+ float lineWidth = 0.0859375 * maxSize; // should be 2.75 for 32x32
+ float lineStart = 0.234375 * maxSize; // should be 7.5 for 32x32
+ float lineEnd = 0.421875 * maxSize; // should be 13.5 for 32x32
+ [path setLineWidth:lineWidth];
+ [path setLineCapStyle:NSRoundLineCapStyle];
+ [path moveToPoint:NSMakePoint(0,lineStart)];
+ [path lineToPoint:NSMakePoint(0,lineEnd)];
+
+ for(i=0; i<_numFins; i++) {
+ if(_isAnimating) {
+ [[_foreColor colorWithAlphaComponent:alpha] set];
+ }
+ else {
+ [[_foreColor colorWithAlphaComponent:0.2] set];
+ }
+
+ [path stroke];
+
+ // we draw all the fins by rotating the CTM, then just redraw the same segment again
+ CGContextRotateCTM(currentContext, 6.282185/_numFins);
+ alpha -= 1.0/_numFins;
+ }
+ [path release];
+
+ [NSGraphicsContext restoreGraphicsState];
}
# pragma mark -
# pragma mark Subclass
-- (void)animate:(id)sender {
-
+- (void)animate:(id)sender
+{
+
if(_position > 0) {
_position--;
}
else {
- _position = _numFins;
- }
+ _position = _numFins;
+ }
[self setNeedsDisplay:YES];
}
-- (void) setupAnimTimer {
- // Just to be safe kill any existing timer.
+- (void) setupAnimTimer
+{
+ // Just to be safe kill any existing timer.
[self disposeAnimTimer];
-
- if ([self window]) {
- // Why animate if not visible? viewDidMoveToWindow will re-call this method when needed.
- _animationTimer = [[NSTimer timerWithTimeInterval:(NSTimeInterval)0.05
- target:self
- selector:@selector(animate:)
- userInfo:nil
- repeats:YES] retain];
-
- [[NSRunLoop currentRunLoop] addTimer:_animationTimer forMode:NSRunLoopCommonModes];
- [[NSRunLoop currentRunLoop] addTimer:_animationTimer forMode:NSDefaultRunLoopMode];
- [[NSRunLoop currentRunLoop] addTimer:_animationTimer forMode:NSEventTrackingRunLoopMode];
- }
+
+ if ([self window]) {
+ // Why animate if not visible? viewDidMoveToWindow will re-call this method when needed.
+ _animationTimer = [[NSTimer timerWithTimeInterval:(NSTimeInterval)0.05
+ target:self
+ selector:@selector(animate:)
+ userInfo:nil
+ repeats:YES] retain];
+
+ [[NSRunLoop currentRunLoop] addTimer:_animationTimer forMode:NSRunLoopCommonModes];
+ [[NSRunLoop currentRunLoop] addTimer:_animationTimer forMode:NSDefaultRunLoopMode];
+ [[NSRunLoop currentRunLoop] addTimer:_animationTimer forMode:NSEventTrackingRunLoopMode];
+ }
}
-- (void) disposeAnimTimer {
+- (void) disposeAnimTimer
+{
[_animationTimer invalidate];
- [_animationTimer release];
- _animationTimer = nil;
+ [_animationTimer release];
+ _animationTimer = nil;
}
-- (void)startAnimation:(id)sender {
- _isAnimating = YES;
-
- [self setupAnimTimer];
+- (void)startAnimation:(id)sender
+{
+ _isAnimating = YES;
+
+ [self setupAnimTimer];
}
-- (void)stopAnimation:(id)sender {
- _isAnimating = NO;
-
- [self disposeAnimTimer];
-
+- (void)stopAnimation:(id)sender
+{
+ _isAnimating = NO;
+
+ [self disposeAnimTimer];
+
[self setNeedsDisplay:YES];
}
# pragma mark Not Implemented
-- (void)setStyle:(NSProgressIndicatorStyle)style {
+- (void)setStyle:(NSProgressIndicatorStyle)style
+{
if (NSProgressIndicatorSpinningStyle != style) {
NSAssert(NO, @"Non-spinning styles not available.");
}
@@ -162,39 +170,45 @@
# pragma mark -
# pragma mark Accessors
-- (NSColor *)foreColor {
+- (NSColor *)foreColor
+{
return [[_foreColor retain] autorelease];
}
-- (void)setForeColor:(NSColor *)value {
+- (void)setForeColor:(NSColor *)value
+{
if (_foreColor != value) {
[_foreColor release];
_foreColor = [value copy];
- [self setNeedsDisplay:YES];
+ [self setNeedsDisplay:YES];
}
}
-- (NSColor *)backColor {
+- (NSColor *)backColor
+{
return [[_backColor retain] autorelease];
}
-- (void)setBackColor:(NSColor *)value {
+- (void)setBackColor:(NSColor *)value
+{
if (_backColor != value) {
[_backColor release];
_backColor = [value copy];
- [self setNeedsDisplay:YES];
+ [self setNeedsDisplay:YES];
}
}
-- (BOOL)drawBackground {
+- (BOOL)drawBackground
+{
return _drawBackground;
}
-- (void)setDrawBackground:(BOOL)value {
+- (void)setDrawBackground:(BOOL)value
+{
if (_drawBackground != value) {
_drawBackground = value;
}
- [self setNeedsDisplay:YES];
+ [self setNeedsDisplay:YES];
}
@end
Code/YRKSpinningProgressIndicator.m
207c8b4c7cf4f6efd0d8de05fe74acc867f48e79
Kelan Champagne
kelan@yeahrightkeller.com
http://github.com/kelan/yrk-spinning-progress-indicator/commit/6446f60b7ecee4fc59bf97db432ef32c89c1ee7e
6446f60b7ecee4fc59bf97db432ef32c89c1ee7e
2009-06-02T21:32:16-07:00
2009-04-30T21:54:48-07:00
whitespace and formatting fixes
c5fc3e6d03f3235e9e64d524910863c0941e7bed
Kelan Champagne
kelan@yeahrightkeller.com