[vlc-commits] macosx: simplify one setting and fix a typo regarding extra video window

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Fri Sep 21 10:18:16 2012 +0200| [bf330d229f438784e830bbb202f87e2e3ec3ec23] | committer: David Fuhrmann

macosx: simplify one setting and fix a typo regarding extra video window

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

 modules/gui/macosx/MainWindow.m |   16 +---------------
 modules/gui/macosx/Windows.m    |    1 +
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 9d98595..a0474c6 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -511,10 +511,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
 #pragma mark -
 #pragma mark overwritten default functionality
-- (BOOL)canBecomeKeyWindow
-{
-    return YES;
-}
 
 - (void)windowResizedOrMoved:(NSNotification *)notification
 {
@@ -787,7 +783,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
         else {
             [o_extra_video_window center];
             [o_extra_video_window setFrameAutosaveName:@"extra-videowindow"];
-            [o_detached_video_window setContentMinSize: NSMakeSize(f_min_video_height, f_min_video_height)];
+            [o_extra_video_window setContentMinSize: NSMakeSize(f_min_video_height, f_min_video_height)];
         }
 
         b_nonembedded = YES;
@@ -1870,14 +1866,4 @@ static VLCMainWindow *_o_sharedInstance = nil;
     }
 }
 
-- (IBAction)fullscreen:(id)sender
-{
-    [[VLCCoreInteraction sharedInstance] toggleFullscreen];
-}
-
-- (BOOL)canBecomeKeyWindow
-{
-    return YES;
-}
-
 @end
diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m
index 9cb5755..f6a1642 100644
--- a/modules/gui/macosx/Windows.m
+++ b/modules/gui/macosx/Windows.m
@@ -242,6 +242,7 @@
 
     /* we want to be moveable regardless of our style */
     [self setMovableByWindowBackground: YES];
+    [self setCanBecomeKeyWindow:YES];
 
     return self;
 }