Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
e3da66b7
Commit
e3da66b7
authored
Aug 01, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: Fix #1802 Cursor not hidden if fullscreen controller is disabled (OS X).
parent
8b524cb8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
3 deletions
+20
-3
modules/gui/macosx/fspanel.m
modules/gui/macosx/fspanel.m
+20
-3
No files found.
modules/gui/macosx/fspanel.m
View file @
e3da66b7
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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