MacOSX: Correctly interprets fillscreen.
authorPierre d'Herbemont <pdherbemont@videolan.org>
Sun, 6 Jan 2008 22:56:58 +0000 (22:56 +0000)
committerPierre d'Herbemont <pdherbemont@videolan.org>
Sun, 6 Jan 2008 22:56:58 +0000 (22:56 +0000)
extras/MacOSX/Framework/Sources/VLCVideoCommon.m
extras/MacOSX/VLC_app/Sources/VLCMainWindow.m

index 5ae69cc..f233593 100644 (file)
@@ -50,7 +50,7 @@
         
         CGFloat xRatio = CGRectGetWidth(bounds)/originalVideoSize.width;
         CGFloat yRatio = CGRectGetHeight(bounds)/originalVideoSize.height;
-        CGFloat ratio = fillScreenEntirely ? MIN(xRatio, yRatio) : MAX(xRatio, yRatio);
+        CGFloat ratio = fillScreenEntirely ? MAX(xRatio, yRatio) : MIX(xRatio, yRatio);
         
         videoRect.size.width = ratio*originalVideoSize.width;
         videoRect.size.height = ratio*originalVideoSize.height;
index bba82b9..f75a9c1 100644 (file)
     [mediaListItemsCount bind:@"displayPatternValue1" toObject:mediaArrayController withKeyPath:@"arrangedObjects.@count" options:[NSDictionary dictionaryWithObject:@"%{value1}@ items" forKey:NSDisplayPatternBindingOption]];
     [mediaListItemFetchedStatus bind:@"animate" toObject:categoriesTreeController withKeyPath:@"selection.currentlyFetchingItems" options:[NSDictionary dictionaryWithObject:@"%{value1}@ items" forKey:NSDisplayPatternBindingOption]];
 
-    [fillScreenButton bind:@"value" toObject:videoView withKeyPath:@"fillScreen" options: [NSDictionary dictionaryWithObject:NSNegateBooleanTransformerName forKey:NSValueTransformerNameBindingOption]];
+    [fillScreenButton bind:@"value" toObject:videoView withKeyPath:@"fillScreen" options: nil];
     [fullScreenButton bind:@"value" toObject:videoView withKeyPath:@"fullScreen" options: nil];
     [fullScreenButton bind:@"enabled" toObject:mediaPlayer withKeyPath:@"playing" options: nil];
     [fillScreenButton bind:@"enabled" toObject:mediaPlayer withKeyPath:@"playing" options: nil];