Changeset aa742bd48e7338574e1beaad5ac63fb078794dc0

Timestamp:

14/09/06 20:47:59 (2 years ago)

Author:

Felix Paul Kühne <fkuehne@videolan.org>

git-committer:

Felix Paul Kühne <fkuehne@videolan.org> 1158259679 +0000

git-parent:

[7a57427bbc9487342e333ce2c63f237c55f4d66e]

git-author:

Felix Paul Kühne <fkuehne@videolan.org> 1158259679 +0000

Message:

* fix a nasty handling bug and convert all comments to C-style

Files:

• modules/gui/macosx/fspanel.m (modified) (14 diffs)

modules/gui/macosx/fspanel.m

@@ -27 +27 @@
- *****************************************************************************/
-#import "intf.h"
+#import "controls.h"
+#import "vout.h"
-#import "fspanel.h"
-
@@ -35 +37 @@
- *****************************************************************************/
-@implementation VLCFSPanel
-/ We override this initializer so we can set the NSBorderlessWindowMask styleMask, and set a few other important settings
+* We override this initializer so we can set the NSBorderlessWindowMask styleMask, and set a few other important settings */
-- (id)initWithContentRect:(NSRect)contentRect 
-                styleMask:(unsigned int)aStyle 
@@ -45 +47 @@
-    [win setHasShadow: NO];
-    [win setBackgroundColor:[NSColor clearColor]];
-
-
+
+
+
-    return win;
-}
@@ -61 +64 @@
-}
-
-/ Windows created with NSBorderlessWindowMask normally can't be key, but we want ours to be
+* Windows created with NSBorderlessWindowMask normally can't be key, but we want ours to be */
-- (BOOL)canBecomeKeyWindow
-{
@@ -95 +98 @@
-}
-
-/ This routine is called repeatedly when the mouse enters the window from outside it.
+* This routine is called repeatedly when the mouse enters the window from outside it. */
-- (void)focus:(NSTimer *)timer
-{
@@ -112 +115 @@
-}
-
-/ This routine is called repeatedly when the mouse exits the window from inside it.
+* This routine is called repeatedly when the mouse exits the window from inside it */
-- (void)unfocus:(NSTimer *)timer
-{
@@ -134 +137 @@
-}
-
-/ If the mouse enters a window, go make sure we fade in
+* If the mouse enters a window, go make sure we fade in */
-- (void)mouseEntered:(NSEvent *)theEvent
-{
@@ -140 +143 @@
-}
-
-/ If the mouse exits a window, go make sure we fade out
+* If the mouse exits a window, go make sure we fade out */
-- (void)mouseExited:(NSEvent *)theEvent
-{
@@ -152 +155 @@
-    }
-
+    /* give up our focus, so the vout may show us again without letting the user clicking it */
+    if( [[[[VLCMain sharedInstance] getControls] getVoutView] isFullscreen] )
+        [[[[[VLCMain sharedInstance] getControls] getVoutView] window] makeKeyWindow];
+
-    [self fadeOut];
-}
@@ -169 +176 @@
-- (void)fadeOut
-{
-
+ 
-    {
-        if (![self fadeTimer])
@@ -219 +226 @@
-}
-
-/ A getter and setter for our main timer that handles window fading
+* A getter and setter for our main timer that handles window fading */
-- (NSTimer *)fadeTimer
-{
@@ -294 +301 @@
-    addButton( o_next, @"FSGotoEndOff.tif"       , @"FSGotoEndOn.tif"      , 286, 37, next );
-    addButton( o_fullscreen, @"FSExitOff.tif", @"FSExitOn.tif", 382, 45, windowAction );
-
+
+
+
-
-    s_rc = [self frame];
@@ -441 +450 @@
-void drawFrameInRect(NSRect frameRect)
-{
-/ Draw frame
+* Draw frame */
-    NSBundle *bundle = [NSBundle mainBundle];
-    NSRect frame = frameRect;
@@ -453 +462 @@
-- (void)drawRect:(NSRect)rect
-{
-/ Draw default to make sure the slider behaves correctly
+* Draw default to make sure the slider behaves correctly */
-    [[NSGraphicsContext currentContext] saveGraphicsState];
-    NSRectClip(NSZeroRect);