Fix previous commit.

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

diff --git a/modules/gui/macosx/fspanel.m b/modules/gui/macosx/fspanel.m
index 701f7a71523c8abc3cec4826e8c93f41fd514317..51e1559dc169202da62460c6084fa35a509a091b 100644 (file)
--- a/modules/gui/macosx/fspanel.m
+++ b/modules/gui/macosx/fspanel.m
@@ -4,8 +4,8 @@
  * Copyright (C) 2006-2007 the VideoLAN team\r
  * $Id$\r
  *\r
- * Authors: J\8er\99me Decoodt <djc at videolan dot org>\r
- *          Felix K\9fhne <fkuehne at videolan dot org>\r
+ * Authors: Jérôme Decoodt <djc at videolan dot org>\r
+ *          Felix Kühne <fkuehne at videolan dot org>\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -28,6 +28,7 @@
 #import "intf.h"\r
 #import "controls.h"\r
 #import "vout.h"\r
+#import "misc.h"\r
 #import "fspanel.h"\r
 \r
 #define KEEP_VISIBLE_AFTER_ACTION 4 /* time in half-sec until this panel will hide again after a user's action */\r
@@ -49,10 +50,10 @@
     \r
     /* let the window sit on top of everything else and start out completely transparent */\r
     [win setLevel:NSModalPanelWindowLevel];\r
-    [win setAlphaValue:0.0];\r
     i_device = 0;\r
-\r
     [win center];\r
+    [self setNonActive:nil];\r
+\r
     return win;\r
 }\r
 \r
@@ -92,17 +93,6 @@
     return YES;\r
 }\r
 \r
-#if GC_ENABLED\r
-- (void)finalize\r
-{\r
-       /* dealloc isn't called on 10.5 in case that GC is enabled, so we need to provide the functionality here */\r
-       [[NSNotificationCenter defaultCenter] removeObserver: self];\r
-       [self setFadeTimer:nil];\r
-       \r
-       [super finalize];\r
-}\r
-#endif\r
-\r
 -(void)dealloc\r
 {\r
     [[NSNotificationCenter defaultCenter] removeObserver: self];\r
@@ -119,13 +109,18 @@
     NSPoint theCoordinate;\r
     NSRect theScreensFrame;\r
     NSRect theWindowsFrame;\r
-\r
-    if( i_device < 0 || i_device >= (signed int)[[NSScreen screens] count] )\r
+    NSScreen *screen;\r
+    \r
+    /* user-defined screen */\r
+    screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device];\r
+    \r
+    if (!screen)\r
+    {\r
         /* invalid preferences or none specified, using main screen */\r
-        theScreensFrame = [[NSScreen mainScreen] frame];\r
-    else\r
-        /* user-defined screen */\r
-        theScreensFrame = [[[NSScreen screens] objectAtIndex: i_device] frame];\r
+        screen = [NSScreen mainScreen];\r
+    }\r
+\r
+    theScreensFrame = [screen frame];\r
 \r
     theWindowsFrame = [self frame];\r
     \r
@@ -222,8 +217,8 @@
         return;\r
     }\r
     if( [self alphaValue] > 0.0 )\r
-        [self setAlphaValue:[self alphaValue]-0.1];\r
-    if( [self alphaValue] <= 0.1 )\r
+        [self setAlphaValue:[self alphaValue]-0.05];\r
+    if( [self alphaValue] <= 0.05 )\r
     {\r
         b_displayed = NO;\r
         [self setAlphaValue:0.0];\r
@@ -274,7 +269,7 @@
     if( ( [self alphaValue] > 0.0 ) )\r
     {\r
         if (![self fadeTimer])\r
-            [self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(unfocus:) userInfo:[NSNumber numberWithShort:0] repeats:YES]];\r
+            [self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(unfocus:) userInfo:[NSNumber numberWithShort:0] repeats:YES]];\r
         else if ([[[self fadeTimer] userInfo] shortValue]==1)\r
             b_fadeQueued=YES;\r
     }\r
@@ -313,6 +308,7 @@
     i_timeToKeepVisibleInSec -= 1;\r
     if( i_timeToKeepVisibleInSec < 1 )\r
     {\r
+        [NSCursor setHiddenUntilMouseMoves: YES];\r
         [self fadeOut];\r
         [timer invalidate];\r
         [timer release];\r
@@ -559,7 +555,7 @@
 \r
 - (void)drawRect:(NSRect)rect\r
 {\r
-       NSRect frame = [self frame];\r
+    NSRect frame = [self frame];\r
     NSRect image_rect;\r
     NSImage *img;\r
     addImage( @"fs_background", 0, 0, NSCompositeCopy, 0 );\r