Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
e3da66b7
Commit
e3da66b7
authored
Aug 01, 2008
by
Pierre d'Herbemont
Browse files
macosx: Fix #1802 Cursor not hidden if fullscreen controller is disabled (OS X).
parent
8b524cb8
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/gui/macosx/fspanel.m
View file @
e3da66b7
...
...
@@ -31,6 +31,10 @@
#import "misc.h"
#import "fspanel.h"
@interface
VLCFSPanel
()
-
(
void
)
hideMouse
;
@end
/*****************************************************************************
* VLCFSPanel
*****************************************************************************/
...
...
@@ -244,10 +248,23 @@
[[[[[
VLCMain
sharedInstance
]
getControls
]
getVoutView
]
window
]
makeKeyWindow
];
}
-
(
void
)
hideMouse
{
[
NSCursor
setHiddenUntilMouseMoves
:
YES
];
}
-
(
void
)
fadeIn
{
/* in case that the user don't want us to appear, just return here */
if
(
!
config_GetInt
(
VLCIntf
,
"macosx-fspanel"
)
||
b_nonActive
)
/* in case that the user don't want us to appear, make sure we hide the mouse */
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
;
[
self
orderFront
:
nil
];
...
...
@@ -310,7 +327,7 @@
/* count down until we hide ourselfes again and do so if necessary */
if
(
--
i_timeToKeepVisibleInSec
<
1
)
{
[
NSCursor
setHiddenUntilMouseMoves
:
YES
];
[
self
hideMouse
];
[
self
fadeOut
];
[
hideAgainTimer
invalidate
];
/* released in -autoHide and -dealloc */
b_alreadyCounting
=
NO
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment