X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/01755ec0d1d9e0d49d003bd3029162388b720cda..b9f80a08cfcd969efa302d34796c1f101acf6d44:/StatusWindow.m?ds=inline diff --git a/StatusWindow.m b/StatusWindow.m index 3465be3..c116c09 100755 --- a/StatusWindow.m +++ b/StatusWindow.m @@ -9,18 +9,18 @@ #import "StatusWindow.h" -#define SW_PAD 24.00 -#define SW_SPACE 24.00 -#define SW_MINW 211.00 -#define SW_BORDER 32.00 -#define SW_METER_PAD 4.00 -#define SW_BUTTON_PAD_R 30.00 -#define SW_BUTTON_PAD_B 24.00 -#define SW_BUTTON_DIV 12.00 -#define SW_BUTTON_EXTRA_W 8.00 -#define SW_SHADOW_SAT 1.25 -#define SMALL_DIVISOR 1.33333 -#define MINI_DIVISOR 1.66667 +#define SW_PAD 24.00 +#define SW_SPACE 24.00 +#define SW_MINW 211.00 +#define SW_BORDER 32.00 +#define SW_METER_PAD 4.00 +#define SW_BUTTON_PAD_R 30.00 +#define SW_BUTTON_PAD_B 24.00 +#define SW_BUTTON_DIV 12.00 +#define SW_BUTTON_EXTRA_W 8.00 +#define SW_SHADOW_SAT 1.25 +#define SMALL_DIVISOR 1.33333 +#define MINI_DIVISOR 1.66667 @interface StatusWindow (Private) - (NSRect)setupWindowWithDataSize:(NSSize)dataSize; @@ -45,7 +45,7 @@ // Set default values. _image = [[NSImage imageNamed:@"NSApplicationIcon"] retain]; _locked = NO; - _sizing = StatusWindowRegular; + _sizing = ITTransientStatusWindowRegular; } return self; @@ -75,7 +75,7 @@ [self setExitMode:(flag ? ITTransientStatusWindowExitOnCommand : ITTransientStatusWindowExitAfterDelay)]; } -- (void)setSizing:(StatusWindowSizing)newSizing +- (void)setSizing:(ITTransientStatusWindowSizing)newSizing { _sizing = newSizing; } @@ -111,15 +111,26 @@ float contentHeight = 0.0; float windowWidth = 0.0; float windowHeight = 0.0; + NSRect visibleFrame = [[self screen] visibleFrame]; + NSPoint screenOrigin = visibleFrame.origin; + float screenWidth = visibleFrame.size.width; + float screenHeight = visibleFrame.size.height; + float maxWidth = ( screenWidth - (SW_BORDER * 2) ); + float maxHeight = ( screenHeight - (SW_BORDER * 2) ); + float excessWidth = 0.0; + float excessHeight = 0.0; + NSPoint windowOrigin; ITImageView *imageView; - - if ( _sizing == StatusWindowSmall ) { + BOOL shouldAnimate = ( ! (([self visibilityState] == ITWindowAppearingState) || + ([self visibilityState] == ITWindowVanishingState)) ); + + if ( _sizing == ITTransientStatusWindowSmall ) { divisor = SMALL_DIVISOR; - } else if ( _sizing == StatusWindowMini ) { + } else if ( _sizing == ITTransientStatusWindowMini ) { divisor = MINI_DIVISOR; } - // Get image width and height. +// Get image width and height. imageWidth = ( [_image size].width / divisor ); imageHeight = ( [_image size].height / divisor ); @@ -130,21 +141,53 @@ windowWidth = ( (SW_PAD / divisor) + imageWidth + (SW_SPACE / divisor) + dataWidth + (SW_PAD / divisor) ); windowHeight = ( (SW_PAD / divisor) + contentHeight + (SW_PAD / divisor) ); -#warning Adjust frame for positioning here. +// Constrain size to max limits. Adjust data sizes accordingly. + excessWidth = (windowWidth - maxWidth ); + excessHeight = (windowHeight - maxHeight); + + if ( excessWidth > 0.0 ) { + windowWidth = maxWidth; + dataWidth -= excessWidth; + } + + if ( excessHeight > 0.0 ) { + windowHeight = maxHeight; + dataHeight -= excessHeight; + } + + if ( [self horizontalPosition] == ITWindowPositionLeft ) { + windowOrigin.x = ( SW_BORDER + screenOrigin.x ); + } else if ( [self horizontalPosition] == ITWindowPositionCenter ) { + windowOrigin.x = ( screenOrigin.x + (screenWidth / 2) - (windowWidth / 2) ); + } else if ( [self horizontalPosition] == ITWindowPositionRight ) { + windowOrigin.x = ( screenOrigin.x + screenWidth - (windowWidth + SW_BORDER) ); + } + + if ( [self verticalPosition] == ITWindowPositionTop ) { + windowOrigin.y = ( screenOrigin.y + screenHeight - (windowHeight + SW_BORDER) ); + } else if ( [self verticalPosition] == ITWindowPositionMiddle ) { +// Middle-oriented windows should be slightly proud of the screen's middle. + windowOrigin.y = ( (screenOrigin.y + (screenHeight / 2) - (windowHeight / 2)) + (screenHeight / 8) ); + } else if ( [self verticalPosition] == ITWindowPositionBottom ) { + windowOrigin.y = ( SW_BORDER + screenOrigin.y ); + } - [self setFrame:NSMakeRect( (SW_BORDER + [[self screen] visibleFrame].origin.x), - (SW_BORDER + [[self screen] visibleFrame].origin.y), + [self setFrame:NSMakeRect( windowOrigin.x, + windowOrigin.y, windowWidth, - windowHeight) display:YES animate:YES]; - [[[self contentView] subviews] makeObjectsPerformSelector:@selector(removeFromSuperview)]; + windowHeight) display:YES animate:shouldAnimate]; + [[[self contentView] subviews] makeObjectsPerformSelector:@selector(removeFromSuperview)]; + // Setup, position, fill, and add the image view to the content view. - imageRect = NSMakeRect( (SW_PAD / divisor), + imageRect = NSMakeRect( (SW_PAD / divisor) + 4, ((SW_PAD / divisor) + ((contentHeight - imageHeight) / 2)), imageWidth, imageHeight ); - imageView = [[[NSImageView alloc] initWithFrame:imageRect] autorelease]; + imageView = [[[ITImageView alloc] initWithFrame:imageRect] autorelease]; + [imageView setAutoresizingMask:(NSViewMinYMargin | NSViewMaxYMargin)]; [imageView setImage:_image]; + [imageView setCastsShadow:YES]; [[self contentView] addSubview:imageView]; return NSMakeRect( ((SW_PAD / divisor) + imageWidth + (SW_SPACE / divisor)), @@ -169,9 +212,9 @@ NSFont *font; NSDictionary *attr; - if ( _sizing == StatusWindowSmall ) { + if ( _sizing == ITTransientStatusWindowSmall ) { divisor = SMALL_DIVISOR; - } else if ( _sizing == StatusWindowMini ) { + } else if ( _sizing == ITTransientStatusWindowMini ) { divisor = MINI_DIVISOR; } @@ -195,6 +238,7 @@ // Create, position, setup, fill, and add the text view to the content view. textField = [[[ITTextField alloc] initWithFrame:dataRect] autorelease]; + [textField setAutoresizingMask:(NSViewHeightSizable | NSViewWidthSizable)]; [textField setEditable:NO]; [textField setSelectable:NO]; [textField setBordered:NO]; @@ -202,6 +246,7 @@ [textField setFont:font]; [textField setTextColor:[NSColor whiteColor]]; [textField setCastsShadow:YES]; + [[textField cell] setWraps:NO]; [textField setStringValue:text]; [textField setShadowSaturation:SW_SHADOW_SAT]; [[self contentView] addSubview:textField]; @@ -234,9 +279,9 @@ NSColor *offColor = [NSColor colorWithCalibratedWhite:0.15 alpha:0.50]; NSMatrix *volMatrix; - if ( _sizing == StatusWindowSmall ) { + if ( _sizing == ITTransientStatusWindowSmall ) { divisor = SMALL_DIVISOR; - } else if ( _sizing == StatusWindowMini ) { + } else if ( _sizing == ITTransientStatusWindowMini ) { divisor = MINI_DIVISOR; } @@ -255,6 +300,7 @@ [volMatrix setCellSize:NSMakeSize(cellWidth, cellHeight)]; [volMatrix setIntercellSpacing:NSMakeSize(0, 0)]; + [volMatrix setAutoresizingMask:(NSViewHeightSizable | NSViewWidthSizable)]; cellEnum = [[volMatrix cells] objectEnumerator]; @@ -295,6 +341,7 @@ { if ( ! _locked ) { + float divisor = 1.0; float textWidth = 0.0; float textHeight = 0.0; float okWidth = 0.0; @@ -312,14 +359,26 @@ NSArray *lines = [message componentsSeparatedByString:@"\n"]; id oneLine = nil; NSEnumerator *lineEnum = [lines objectEnumerator]; + float baseFontSize = 18.0; ITTextField *textField; ITButton *okButton; ITButton *cancelButton; NSColor *textColor = [NSColor whiteColor]; - NSFont *font = [NSFont fontWithName:@"Lucida Grande Bold" size:18]; - NSDictionary *attr = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName]; - NSFont *buttonFont = [NSFont fontWithName:@"Lucida Grande Bold" size:14]; - NSDictionary *buttonAttr = [NSDictionary dictionaryWithObjectsAndKeys: + NSFont *font; + NSDictionary *attr; + NSFont *buttonFont; + NSDictionary *buttonAttr; + + if ( _sizing == ITTransientStatusWindowSmall ) { + divisor = SMALL_DIVISOR; + } else if ( _sizing == ITTransientStatusWindowMini ) { + divisor = MINI_DIVISOR; + } + + font = [NSFont fontWithName:@"Lucida Grande Bold" size:(baseFontSize / divisor)]; + attr = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName]; + buttonFont = [NSFont fontWithName:@"Lucida Grande Bold" size:(14 / divisor)]; + buttonAttr = [NSDictionary dictionaryWithObjectsAndKeys: buttonFont , NSFontAttributeName, textColor , NSForegroundColorAttributeName, nil]; @@ -346,8 +405,8 @@ } // Make the buttons, set the titles, and size them to fit their titles - okButton = [[ITButton alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)]; - cancelButton = [[ITButton alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)]; + okButton = [[[ITButton alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)] autorelease]; + cancelButton = [[[ITButton alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)] autorelease]; [okButton setTarget:target]; [cancelButton setTarget:target]; [okButton setAction:okAction]; @@ -418,7 +477,9 @@ wideButtonW, 24.0)]; [[self contentView] addSubview:okButton]; - [[self contentView] addSubview:cancelButton]; + if (alternateTitle) { + [[self contentView] addSubview:cancelButton]; + } [self setIgnoresMouseEvents:NO]; @@ -427,5 +488,9 @@ } } +- (NSTimeInterval)animationResizeTime:(NSRect)newFrame +{ + return (NSTimeInterval)0.25; +} @end