Commit e3da66b7 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files

macosx: Fix #1802 Cursor not hidden if fullscreen controller is disabled (OS X).

parent 8b524cb8
...@@ -31,6 +31,10 @@ ...@@ -31,6 +31,10 @@
#import "misc.h" #import "misc.h"
#import "fspanel.h" #import "fspanel.h"
@interface VLCFSPanel ()
- (void)hideMouse;
@end
/***************************************************************************** /*****************************************************************************
* VLCFSPanel * VLCFSPanel
*****************************************************************************/ *****************************************************************************/
...@@ -244,10 +248,23 @@ ...@@ -244,10 +248,23 @@
[[[[[VLCMain sharedInstance] getControls] getVoutView] window] makeKeyWindow]; [[[[[VLCMain sharedInstance] getControls] getVoutView] window] makeKeyWindow];
} }
- (void)hideMouse
{
[NSCursor setHiddenUntilMouseMoves: YES];
}
- (void)fadeIn - (void)fadeIn
{ {
/* in case that the user don't want us to appear, just return here */ /* in case that the user don't want us to appear, make sure we hide the mouse */
if(! config_GetInt( VLCIntf, "macosx-fspanel" ) || b_nonActive )
if( !config_GetInt( VLCIntf, "macosx-fspanel" ) )
{
float time = (float)var_CreateGetInteger( VLCIntf, "mouse-hide-timeout" ) / 1000.;
[self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:time target:self selector:@selector(hideMouse) userInfo:nil repeats:NO]];
return;
}
if( b_nonActive )
return; return;
[self orderFront: nil]; [self orderFront: nil];
...@@ -310,7 +327,7 @@ ...@@ -310,7 +327,7 @@
/* count down until we hide ourselfes again and do so if necessary */ /* count down until we hide ourselfes again and do so if necessary */
if( --i_timeToKeepVisibleInSec < 1 ) if( --i_timeToKeepVisibleInSec < 1 )
{ {
[NSCursor setHiddenUntilMouseMoves: YES]; [self hideMouse];
[self fadeOut]; [self fadeOut];
[hideAgainTimer invalidate]; /* released in -autoHide and -dealloc */ [hideAgainTimer invalidate]; /* released in -autoHide and -dealloc */
b_alreadyCounting = NO; b_alreadyCounting = NO;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment