FINALLY got CVS working. Fixed another elusive menu bug that hated me.

[MenuTunes.git] / StatusWindowController.m

diff --git a/StatusWindowController.m b/StatusWindowController.m
index a9859c3..d7bd2ff 100755 (executable)
--- a/StatusWindowController.m
+++ b/StatusWindowController.m
@@ -5,26 +5,55 @@
 
 - (id)init
 {
-    if ( (self = [super init]) )
-    {
+    if ( (self = [super init]) ) {
         [NSBundle loadNibNamed:@"StatusWindow" owner:self];
         [statusWindow center];
     }
     return self;
 }
 
-- (void)setUpcomingSongs:(NSString *)string numSongs:(int)songs
+- (void)setUpcomingSongs:(NSString *)string
 {
+    int size = 0, i;
+    NSArray *lines = [string componentsSeparatedByString:@"\n"];
+    
+    for (i = 0; i < [lines count]; i++) {
+        int temp = [[lines objectAtIndex:i] sizeWithAttributes:[NSDictionary dictionaryWithObject:[NSFont fontWithName:@"Lucida Grande" size:12] forKey:NSFontAttributeName]].width;
+        
+        if (temp > size) {
+            size = temp;
+        }
+    }
+    
+    if (size < 255) {
+        size = 255;
+    }
+    
     [statusField setStringValue:string];
-    [statusWindow setFrame:NSMakeRect(0, 0, 300, 40 + (songs * 17)) display:NO];
+    [statusWindow setFrame:NSMakeRect(0, 0, size + 45, 40 + ([lines count] * 17)) display:NO];
     [statusWindow center];
     [statusWindow makeKeyAndOrderFront:nil];
 }
 
-- (void)setTrackInfo:(NSString *)string lines:(int)lines
+- (void)setTrackInfo:(NSString *)string
 {
+    int size = 0, i;
+    NSArray *lines = [string componentsSeparatedByString:@"\n"];
+    
+    for (i = 0; i < [lines count]; i++) {
+        int temp = [[lines objectAtIndex:i] sizeWithAttributes:[NSDictionary dictionaryWithObject:[NSFont fontWithName:@"Lucida Grande" size:12] forKey:NSFontAttributeName]].width;
+        
+        if (temp > size) {
+            size = temp;
+        }
+    }
+    
+    if (size < 285) {
+        size = 285;
+    }
+    
     [statusField setStringValue:string];
-    [statusWindow setFrame:NSMakeRect(0, 0, 316, 40 + (lines * 17)) display:NO];
+    [statusWindow setFrame:NSMakeRect(0, 0, size + 45, 40 + ([lines count] * 17)) display:NO];
     [statusWindow center];
     [statusWindow makeKeyAndOrderFront:nil];
 }
@@ -32,15 +61,13 @@
 - (void)fadeWindowOut
 {
     [NSThread detachNewThreadSelector:@selector(fadeOutAux) toTarget:self withObject:nil];
-    
 }
 
 - (void)fadeOutAux
 {
     NSAutoreleasePool *p00l = [[NSAutoreleasePool alloc] init];
     float i;
-    for (i = 1.0; i > 0; i -= .003)
-    {
+    for (i = 1.0; i > 0; i -= .003) {
         [statusWindow setAlphaValue:i];
     }
     [statusWindow close];