Qt: messages dialog: new verbosity spinbox

[vlc] / modules / gui / macosx / embeddedwindow.m

diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m
index 50c1f0242ca63c63c4e11f9340eb88cc10c0a196..6491af45c2af4ac93547c39c6970303fce964ae9 100644 (file)
--- a/modules/gui/macosx/embeddedwindow.m
+++ b/modules/gui/macosx/embeddedwindow.m
@@ -248,25 +248,17 @@
 
 - (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize
 {
-       NSView *playlist_area = [[o_vertical_split subviews] objectAtIndex:1];
-       NSRect newList = [playlist_area frame];
-       if( newList.size.height < 50 && newList.size.height > 0 ) {
-               [self togglePlaylist:self];
-       }
-
-    /* With no video open or with the playlist open the behavior is odd */
-    if( newList.size.height > 50 )
-        return proposedFrameSize;
-
     if( videoRatio.height == 0. || videoRatio.width == 0. )
         return proposedFrameSize;
 
-    NSRect viewRect = [o_view convertRect:[o_view bounds] toView: nil];
-    NSRect contentRect = [self contentRectForFrameRect:[self frame]];
-    float marginy = viewRect.origin.y + [self frame].size.height - contentRect.size.height;
-    float marginx = contentRect.size.width - viewRect.size.width;
-
-    proposedFrameSize.height = (proposedFrameSize.width - marginx) * videoRatio.height / videoRatio.width + marginy;
+    if( [[[VLCMain sharedInstance] controls] aspectRatioIsLocked] )
+    {
+        NSRect viewRect = [o_view convertRect:[o_view bounds] toView: nil];
+        NSRect contentRect = [self contentRectForFrameRect:[self frame]];
+        float marginy = viewRect.origin.y + [self frame].size.height - contentRect.size.height;
+        float marginx = contentRect.size.width - viewRect.size.width;
+        proposedFrameSize.height = (proposedFrameSize.width - marginx) * videoRatio.height / videoRatio.width + marginy;
+    }
 
     return proposedFrameSize;
 }
@@ -443,7 +435,7 @@
     /* Only create the o_fullscreen_window if we are not in the middle of the zooming animation */
     if (!o_fullscreen_window)
     {
-        /* We can't change the styleMask of an already created NSWindow, so we create an other window, and do eye catching stuff */
+        /* We can't change the styleMask of an already created NSWindow, so we create another window, and do eye catching stuff */
 
         rect = [[o_view superview] convertRect: [o_view frame] toView: nil]; /* Convert to Window base coord */
         rect.origin.x += [self frame].origin.x;