Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
f258e9c7
Commit
f258e9c7
authored
Jul 06, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: Fix various crashes with the fspanel.
Fullscreen is working back.
parent
f2f389ba
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
14 deletions
+15
-14
modules/gui/macosx/fspanel.m
modules/gui/macosx/fspanel.m
+15
-14
No files found.
modules/gui/macosx/fspanel.m
View file @
f258e9c7
...
...
@@ -50,8 +50,8 @@
[
win
setLevel
:
NSModalPanelWindowLevel
];
i_device
=
0
;
[
win
center
];
hideAgainTimer
=
fadeTimer
=
nil
;
[
self
setNonActive
:
nil
];
return
win
;
}
...
...
@@ -94,7 +94,7 @@
-
(
void
)
dealloc
{
[[
NSNotificationCenter
defaultCenter
]
removeObserver
:
self
];
if
(
hideAgainTimer
)
{
[
hideAgainTimer
invalidate
];
...
...
@@ -249,7 +249,7 @@
/* in case that the user don't want us to appear, just return here */
if
(
!
config_GetInt
(
VLCIntf
,
"macosx-fspanel"
)
||
b_nonActive
)
return
;
[
self
orderFront
:
nil
];
if
(
[
self
alphaValue
]
<
1
.
0
||
b_displayed
!=
YES
)
...
...
@@ -285,14 +285,18 @@
/* get us a valid timer */
if
(
!
b_alreadyCounting
)
{
i_timeToKeepVisibleInSec
=
config_GetInt
(
VLCIntf
,
"mouse-hide-timeout"
)
/
500
;
hideAgainTimer
=
[
NSTimer
scheduledTimerWithTimeInterval
:
0
.
5
i_timeToKeepVisibleInSec
=
var_CreateGetInteger
(
VLCIntf
,
"mouse-hide-timeout"
)
/
500
;
if
(
hideAgainTimer
)
{
[
hideAgainTimer
invalidate
];
[
hideAgainTimer
autorelease
];
}
/* released in -autoHide and -dealloc */
hideAgainTimer
=
[[
NSTimer
scheduledTimerWithTimeInterval
:
0
.
5
target:
self
selector:
@selector
(
keepVisible
:)
userInfo:
nil
repeats:
YES
];
[
hideAgainTimer
fire
];
[
hideAgainTimer
retain
];
repeats:
YES
]
retain
];
b_alreadyCounting
=
YES
;
}
}
...
...
@@ -304,15 +308,12 @@
b_keptVisible
=
NO
;
/* count down until we hide ourselfes again and do so if necessary */
i_timeToKeepVisibleInSec
-=
1
;
if
(
i_timeToKeepVisibleInSec
<
1
)
if
(
--
i_timeToKeepVisibleInSec
<
1
)
{
[
NSCursor
setHiddenUntilMouseMoves
:
YES
];
[
self
fadeOut
];
[
timer
invalidate
];
[
timer
release
];
[
hideAgainTimer
invalidate
];
/* released in -autoHide and -dealloc */
b_alreadyCounting
=
NO
;
timer
=
NULL
;
}
}
...
...
@@ -326,7 +327,7 @@
{
[
timer
retain
];
[
fadeTimer
invalidate
];
[
fadeTimer
release
];
[
fadeTimer
auto
release
];
fadeTimer
=
timer
;
}
...
...
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