Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
c8bad308
Commit
c8bad308
authored
Aug 06, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: add missing deletate for blackout window hiding animation (fixes #9106)
parent
bbaeca0a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
modules/gui/macosx/Windows.h
modules/gui/macosx/Windows.h
+1
-1
modules/gui/macosx/Windows.m
modules/gui/macosx/Windows.m
+11
-5
No files found.
modules/gui/macosx/Windows.h
View file @
c8bad308
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
@class
VLCVoutView
;
@class
VLCVoutView
;
@interface
VLCWindow
:
NSWindow
@interface
VLCWindow
:
NSWindow
<
NSAnimationDelegate
>
{
{
BOOL
b_canBecomeKeyWindow
;
BOOL
b_canBecomeKeyWindow
;
BOOL
b_isset_canBecomeKeyWindow
;
BOOL
b_isset_canBecomeKeyWindow
;
...
...
modules/gui/macosx/Windows.m
View file @
c8bad308
...
@@ -88,7 +88,9 @@
...
@@ -88,7 +88,9 @@
return
;
return
;
}
}
invoc
=
[
NSInvocation
invocationWithMethodSignature
:[
super
methodSignatureForSelector
:
@selector
(
close
)]];
// TODO this callback stuff does not work and is not needed
invoc
=
[[[
NSInvocation
alloc
]
init
]
autorelease
];
[
invoc
setSelector
:
@selector
(
close
)];
[
invoc
setTarget
:
self
];
[
invoc
setTarget
:
self
];
if
(
!
[
self
isVisible
]
||
[
self
alphaValue
]
==
0
.
0
)
{
if
(
!
[
self
isVisible
]
||
[
self
alphaValue
]
==
0
.
0
)
{
...
@@ -101,9 +103,10 @@
...
@@ -101,9 +103,10 @@
-
(
void
)
orderOut
:
(
id
)
sender
animate
:
(
BOOL
)
animate
-
(
void
)
orderOut
:
(
id
)
sender
animate
:
(
BOOL
)
animate
{
{
NSInvocation
*
invoc
=
[
NSInvocation
invocationWithMethodSignature
:[
super
methodSignatureForSelector
:
@selector
(
orderOut
:)]];
NSInvocation
*
invoc
=
[[[
NSInvocation
alloc
]
init
]
autorelease
];
[
invoc
setSelector
:
@selector
(
orderOut
:)];
[
invoc
setTarget
:
self
];
[
invoc
setTarget
:
self
];
[
invoc
setArgument
:
sender
atIndex
:
0
];
[
invoc
setArgument
:
sender
atIndex
:
2
];
[
self
orderOut
:
sender
animate
:
animate
callback
:
invoc
];
[
self
orderOut
:
sender
animate
:
animate
callback
:
invoc
];
}
}
...
@@ -129,7 +132,8 @@
...
@@ -129,7 +132,8 @@
[
anim
setAnimationBlockingMode
:
NSAnimationNonblocking
];
[
anim
setAnimationBlockingMode
:
NSAnimationNonblocking
];
[
anim
setDuration
:
0
.
9
];
[
anim
setDuration
:
0
.
9
];
[
anim
setFrameRate
:
30
];
[
anim
setFrameRate
:
30
];
[
anim
setUserInfo
:
callback
];
[
anim
setUserInfo
:
callback
];
[
anim
setDelegate
:
self
];
@synchronized
(
self
)
{
@synchronized
(
self
)
{
current_anim
=
self
->
o_current_animation
;
current_anim
=
self
->
o_current_animation
;
...
@@ -182,6 +186,7 @@
...
@@ -182,6 +186,7 @@
[
anim
setAnimationBlockingMode
:
NSAnimationNonblocking
];
[
anim
setAnimationBlockingMode
:
NSAnimationNonblocking
];
[
anim
setDuration
:
0
.
5
];
[
anim
setDuration
:
0
.
5
];
[
anim
setFrameRate
:
30
];
[
anim
setFrameRate
:
30
];
[
anim
setDelegate
:
self
];
@synchronized
(
self
)
{
@synchronized
(
self
)
{
current_anim
=
self
->
o_current_animation
;
current_anim
=
self
->
o_current_animation
;
...
@@ -209,9 +214,10 @@
...
@@ -209,9 +214,10 @@
NSInvocation
*
invoc
;
NSInvocation
*
invoc
;
[
super
orderOut
:
nil
];
[
super
orderOut
:
nil
];
[
self
setAlphaValue
:
1
.
0
];
[
self
setAlphaValue
:
1
.
0
];
if
((
invoc
=
[
anim
userInfo
]))
if
((
invoc
=
[
anim
userInfo
]))
{
[
invoc
invoke
];
[
invoc
invoke
];
}
}
}
}
}
-
(
VLCVoutView
*
)
videoView
-
(
VLCVoutView
*
)
videoView
...
...
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