#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;
// Set default values.
_image = [[NSImage imageNamed:@"NSApplicationIcon"] retain];
_locked = NO;
- _sizing = StatusWindowRegular;
+ _sizing = ITTransientStatusWindowRegular;
}
return self;
[self setExitMode:(flag ? ITTransientStatusWindowExitOnCommand : ITTransientStatusWindowExitAfterDelay)];
}
-- (void)setSizing:(StatusWindowSizing)newSizing
+- (void)setSizing:(ITTransientStatusWindowSizing)newSizing
{
_sizing = newSizing;
}
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 );
// Setup the Window, and remove all its contentview's subviews.
windowWidth = ( (SW_PAD / divisor) + imageWidth + (SW_SPACE / divisor) + dataWidth + (SW_PAD / divisor) );
windowHeight = ( (SW_PAD / divisor) + contentHeight + (SW_PAD / divisor) );
- [self setFrame:NSMakeRect( (SW_BORDER + [[self screen] visibleFrame].origin.x),
- (SW_BORDER + [[self screen] visibleFrame].origin.y),
+
+// 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( 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)),
NSFont *font;
NSDictionary *attr;
- if ( _sizing == StatusWindowSmall ) {
+ if ( _sizing == ITTransientStatusWindowSmall ) {
divisor = SMALL_DIVISOR;
- } else if ( _sizing == StatusWindowMini ) {
+ } else if ( _sizing == ITTransientStatusWindowMini ) {
divisor = MINI_DIVISOR;
}
// 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];
[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];
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;
}
[volMatrix setCellSize:NSMakeSize(cellWidth, cellHeight)];
[volMatrix setIntercellSpacing:NSMakeSize(0, 0)];
+ [volMatrix setAutoresizingMask:(NSViewHeightSizable | NSViewWidthSizable)];
cellEnum = [[volMatrix cells] objectEnumerator];
}
}
+- (NSTimeInterval)animationResizeTime:(NSRect)newFrame
+{
+ return (NSTimeInterval)0.25;
+}
@end
git.ithinksw.org / MenuTunes.git / blobdiff