Aspect Ratio v2

[MenuTunes.git] / StatusWindowController.m

diff --git a/StatusWindowController.m b/StatusWindowController.m
index 3108cd9..8d9ec8a 100755 (executable)
--- a/StatusWindowController.m
+++ b/StatusWindowController.m
@@ -114,14 +114,13 @@ static StatusWindowController *sharedController;
     NSString *text  = title;
     
     if ( art != nil ) {
     NSString *text  = title;
     
     if ( art != nil ) {

-        image = art;
-        [image setScalesWhenResized:YES];
-        [image setSize:NSMakeSize(110, 110)];
-        /*if (size.width > 110 && size.width > size.height) {
-            [image setSize:NSMakeSize(110, (size.width / size.height) * 110)];
-        } else if (size.height > 110 && size.height > size.width) {
-            [image setSize:NSMakeSize((size.height / size.width) * 110, 110)];
-        }*/
+       NSSize oldSize, newSize;
+       image = art;
+       [image setScalesWhenResized:YES];
+       oldSize = [image size];
+       if (oldSize.width > oldSize.height) newSize = NSMakeSize(110,oldSize.height * (110.0f / oldSize.width));
+       else newSize = NSMakeSize(oldSize.width * (110.0f / oldSize.height),110);
+       [image setSize:newSize];

     } else if ( source == ITMTRemoteLibrarySource ) {
         image = [NSImage imageNamed:@"Library"];
     } else if ( source == ITMTRemoteCDSource ) {
     } else if ( source == ITMTRemoteLibrarySource ) {
         image = [NSImage imageNamed:@"Library"];
     } else if ( source == ITMTRemoteCDSource ) {


@@ -273,7 +272,7 @@ static StatusWindowController *sharedController;
 {
     NSString *message = @"The selected shared player is available again.\nWould you like to reconnect to it?.";
 
 {
     NSString *message = @"The selected shared player is available again.\nWould you like to reconnect to it?.";
 

-    [_window setImage:[NSImage imageNamed:@"Register"]];
+    [_window setImage:[NSImage imageNamed:@"Setup"]];

     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message
                             defaultButton:@"Reconnect"
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message
                             defaultButton:@"Reconnect"