#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;
- (void)dealloc
{
- [_image release];
+ [_image release];
[super dealloc];
}
_sizing = newSizing;
}
-
/*************************************************************************/
#pragma mark -
#pragma mark INSTANCE METHODS
float maxHeight = ( screenHeight - (SW_BORDER * 2) );
float excessWidth = 0.0;
float excessHeight = 0.0;
- NSPoint windowOrigin;
+ NSPoint windowOrigin = NSZeroPoint;
ITImageView *imageView;
BOOL shouldAnimate = ( ! (([self visibilityState] == ITWindowAppearingState) ||
([self visibilityState] == ITWindowVanishingState)) );
-
+
if ( _sizing == ITTransientStatusWindowSmall ) {
divisor = SMALL_DIVISOR;
} else if ( _sizing == ITTransientStatusWindowMini ) {
contentHeight = ( ( imageHeight > dataHeight ) ? imageHeight : dataHeight );
// Setup the Window, and remove all its contentview's subviews.
- windowWidth = ( (SW_PAD / divisor) + imageWidth + (SW_SPACE / divisor) + dataWidth + (SW_PAD / divisor) );
+ windowWidth = ( (SW_PAD / divisor) + imageWidth + ((dataWidth > 0) ? (SW_SPACE / divisor) + dataWidth : 0) + (SW_PAD / divisor) );
windowHeight = ( (SW_PAD / divisor) + contentHeight + (SW_PAD / divisor) );
// Constrain size to max limits. Adjust data sizes accordingly.
[[[self contentView] subviews] makeObjectsPerformSelector:@selector(removeFromSuperview)];
// Setup, position, fill, and add the image view to the content view.
- imageRect = NSMakeRect( (SW_PAD / divisor) + 4,
+ imageRect = NSMakeRect( (SW_PAD / divisor) + ((dataWidth > 0) ? 4 : 0),
((SW_PAD / divisor) + ((contentHeight - imageHeight) / 2)),
imageWidth,
imageHeight );
dataHeight);
}
-- (void)buildTextWindowWithString:(NSString *)text
+- (void)buildImageWindowWithImage:(NSImage *)image
+{
+ if (!_locked) {
+ float divisor = 1.0;
+ NSRect dataRect;
+
+ if (_sizing == ITTransientStatusWindowSmall) {
+ divisor = SMALL_DIVISOR;
+ } else if (_sizing == ITTransientStatusWindowMini) {
+ divisor = MINI_DIVISOR;
+ }
+
+ [self setImage:image];
+ dataRect = [self setupWindowWithDataSize:NSMakeSize(0, 0)]; //We have no text, so there is no data
+ [[self contentView] setNeedsDisplay:YES];
+ }
+}
+
+- (void)buildTextWindowWithString:(id)text
{
if ( ! _locked ) {
float dataWidth = 0.0;
float dataHeight = 0.0;
NSRect dataRect;
- NSArray *lines = [text componentsSeparatedByString:@"\n"];
+ NSArray *lines = [(([text isKindOfClass:[NSString class]]) ? text : [text mutableString]) componentsSeparatedByString:@"\n"];
id oneLine = nil;
- NSEnumerator *lineEnum = [lines objectEnumerator];
+ NSEnumerator *lineEnum = [lines objectEnumerator];
float baseFontSize = 18.0;
ITTextField *textField;
NSFont *font;
} else if ( _sizing == ITTransientStatusWindowMini ) {
divisor = MINI_DIVISOR;
}
-
- font = [NSFont fontWithName:@"Lucida Grande Bold" size:(baseFontSize / divisor)];
- attr = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];
-
+
+ font = [NSFont fontWithName:@"LucidaGrande-Bold" size:(baseFontSize / divisor)];
+ attr = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];
+
// Iterate over each line to get text width and height
while ( (oneLine = [lineEnum nextObject]) ) {
// Get the width of one line, adding 8.0 because Apple sucks donkey rectum.
[textField setTextColor:[NSColor whiteColor]];
[textField setCastsShadow:YES];
[[textField cell] setWraps:NO];
- [textField setStringValue:text];
+
+ if ([text isKindOfClass:[NSString class]]) {
+ [textField setStringValue:text];
+ } else {
+ [textField setAttributedStringValue:text];
+ }
+
[textField setShadowSaturation:SW_SHADOW_SAT];
[[self contentView] addSubview:textField];
// Display the window.
[[self contentView] setNeedsDisplay:YES];
-
+ _textField = textField;
}
}
divisor = MINI_DIVISOR;
}
- font = [NSFont fontWithName:@"Lucida Grande Bold" size:( size / divisor )];
+ font = [NSFont fontWithName:@"AppleGothic" size:( size / divisor )];
attr = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];
charSize = [character sizeWithAttributes:attr];
cellHeight = ( charSize.height + 4.0 ); // Add 4.0 for shadow
divisor = MINI_DIVISOR;
}
- font = [NSFont fontWithName:@"Lucida Grande Bold" size:(baseFontSize / divisor)];
+ font = [NSFont fontWithName:@"LucidaGrande-Bold" size:(baseFontSize / divisor)];
attr = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];
- buttonFont = [NSFont fontWithName:@"Lucida Grande Bold" size:(14 / divisor)];
+ buttonFont = [NSFont fontWithName:@"LucidaGrande-Bold" size:(14 / divisor)];
buttonAttr = [NSDictionary dictionaryWithObjectsAndKeys:
buttonFont , NSFontAttributeName,
textColor , NSForegroundColorAttributeName,
}
// 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];
}
}
+- (void)updateTime:(NSString *)time range:(NSRange)range
+{
+ NSMutableAttributedString *string = [[_textField attributedStringValue] mutableCopy];
+ [string replaceCharactersInRange:range withString:time];
+ [_textField setAttributedStringValue:[string autorelease]];
+ [[self contentView] setNeedsDisplay:YES];
+}
+
- (NSTimeInterval)animationResizeTime:(NSRect)newFrame
{
return (NSTimeInterval)0.25;
git.ithinksw.org / MenuTunes.git / blobdiff