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
e5267d38
Commit
e5267d38
authored
Feb 15, 2014
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: use custom animation for native fullscreen to continue video in animation
close #6347
parent
90ff214a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
46 additions
and
1 deletion
+46
-1
modules/gui/macosx/Windows.h
modules/gui/macosx/Windows.h
+2
-0
modules/gui/macosx/Windows.m
modules/gui/macosx/Windows.m
+44
-1
No files found.
modules/gui/macosx/Windows.h
View file @
e5267d38
...
...
@@ -110,6 +110,8 @@ static const float f_min_video_height = 70.0;
// true when the window is in transition for entering or exiting fullscreen
BOOL
b_in_fullscreen_transition
;
NSRect
frameBeforeLionFullscreen
;
}
@property
(
nonatomic
,
assign
)
VLCVoutView
*
videoView
;
...
...
modules/gui/macosx/Windows.m
View file @
e5267d38
...
...
@@ -625,6 +625,48 @@
[[[
VLCMainWindow
sharedInstance
]
fsPanel
]
setNonActive
:
nil
];
}
-
(
NSArray
*
)
customWindowsToEnterFullScreenForWindow
:(
NSWindow
*
)
window
{
if
(
window
==
self
)
{
return
[
NSArray
arrayWithObject
:
window
];
}
return
nil
;
}
-
(
NSArray
*
)
customWindowsToExitFullScreenForWindow
:(
NSWindow
*
)
window
{
if
(
window
==
self
)
{
return
[
NSArray
arrayWithObject
:
window
];
}
return
nil
;
}
-
(
void
)
window
:
window
startCustomAnimationToEnterFullScreenWithDuration
:
(
NSTimeInterval
)
duration
{
[
window
setStyleMask
:([
window
styleMask
]
|
NSFullScreenWindowMask
)];
NSScreen
*
screen
=
[
window
screen
];
NSRect
screenFrame
=
[
screen
frame
];
[
NSAnimationContext
runAnimationGroup
:
^
(
NSAnimationContext
*
context
)
{
[
context
setDuration
:
0
.
5
*
duration
];
[[
window
animator
]
setFrame
:
screenFrame
display
:
YES
];
}
completionHandler
:
nil
];
}
-
(
void
)
window
:
window
startCustomAnimationToExitFullScreenWithDuration
:
(
NSTimeInterval
)
duration
{
[
window
setStyleMask
:([
window
styleMask
]
&
~
NSFullScreenWindowMask
)];
[[
window
animator
]
setFrame
:
frameBeforeLionFullscreen
display
:
YES
animate
:
YES
];
[
NSAnimationContext
runAnimationGroup
:
^
(
NSAnimationContext
*
context
)
{
[
context
setDuration
:
0
.
5
*
duration
];
[[
window
animator
]
setFrame
:
frameBeforeLionFullscreen
display
:
YES
animate
:
YES
];
}
completionHandler
:
nil
];
}
-
(
void
)
windowWillEnterFullScreen
:(
NSNotification
*
)
notification
{
// workaround, see #6668
...
...
@@ -639,6 +681,8 @@
var_SetBool
(
pl_Get
(
VLCIntf
),
"fullscreen"
,
true
);
frameBeforeLionFullscreen
=
[
self
frame
];
if
([
self
hasActiveVideo
])
{
vout_thread_t
*
p_vout
=
getVoutForActiveWindow
();
if
(
p_vout
)
{
...
...
@@ -665,7 +709,6 @@
if
(
!
[
o_video_view
isHidden
])
{
[[
o_controls_bar
bottomBarView
]
setHidden
:
YES
];
}
[
self
setMovableByWindowBackground
:
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