[vlc-commits] macosx: fix issue which caused automatic video resizing even if disabled

[David Fuhrmann]

vlc/vlc-2.1 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Mon Nov 25 17:38:01 2013 +0100| [eedd67057b6808f4d182abb35ad441fc4c47ba3d] | committer: David Fuhrmann

macosx: fix issue which caused automatic video resizing even if disabled

close #9864

(cherry picked from commit b82bc83428aa33f2b5af2b4201f0926d2ebfe4ba)
Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=eedd67057b6808f4d182abb35ad441fc4c47ba3d
---

 NEWS                                         |    1 +
 modules/gui/macosx/VLCVoutWindowController.m |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 027b75d..69fade3 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ Mac OS X interface:
  * Fix an issue which could prevent automatic UI language settings from working
  * Fix opening subtitles files through drag & drop or double-clicking
  * Fix crash when closing window without decorations
+ * Fix issue where extra video window was resized even if this was disabled
  * Option to control VLC's iTunes pausing behavior is more easy to find
  * Improved UI resetting when requested in the preferences
 
diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m
index 595a27c..224f12a 100644
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@ -187,10 +187,9 @@
     }
 
     if (!b_video_wallpaper) {
-        // set window size
-
+        // set (only!) window origin if specified
         if (b_nonembedded) {
-            NSRect window_rect = [o_new_video_window getWindowRectForProposedVideoViewSize:videoViewSize];
+            NSRect window_rect = [o_new_video_window frame];
             if (videoViewPosition.origin.x > 0.)
                 window_rect.origin.x = videoViewPosition.origin.x;
             if (videoViewPosition.origin.y > 0.)
@@ -212,6 +211,7 @@
             [o_new_video_window setFrameTopLeftPoint: top_left_point];
         }
 
+        // resize window
         [o_new_video_window setNativeVideoSize:videoViewSize];
 
         [o_new_video_window makeKeyAndOrderFront: self];