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
f6c636ae
Commit
f6c636ae
authored
Jun 06, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: move fullscreen-related method to VideoWindowCommon class
No functional changes, code is still inactive
parent
3c2b8b3e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
34 deletions
+49
-34
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+0
-34
modules/gui/macosx/Windows.m
modules/gui/macosx/Windows.m
+49
-0
No files found.
modules/gui/macosx/MainWindow.m
View file @
f6c636ae
...
...
@@ -813,40 +813,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
}
-
(
void
)
makeKeyAndOrderFront
:
(
id
)
sender
{
/* Hack
* when we exit fullscreen and fade out, we may endup in
* having a window that is faded. We can't have it fade in unless we
* animate again. */
if
(
!
b_window_is_invisible
)
{
/* Make sure we don't do it too much */
[
super
makeKeyAndOrderFront
:
sender
];
return
;
}
[
super
setAlphaValue
:
0
.
0
f
];
[
super
makeKeyAndOrderFront
:
sender
];
NSMutableDictionary
*
dict
=
[[
NSMutableDictionary
alloc
]
initWithCapacity
:
2
];
[
dict
setObject
:
self
forKey
:
NSViewAnimationTargetKey
];
[
dict
setObject
:
NSViewAnimationFadeInEffect
forKey
:
NSViewAnimationEffectKey
];
o_makekey_anim
=
[[
NSViewAnimation
alloc
]
initWithViewAnimations
:@[
dict
]];
[
dict
release
];
[
o_makekey_anim
setAnimationBlockingMode
:
NSAnimationNonblocking
];
[
o_makekey_anim
setDuration
:
0
.
1
];
[
o_makekey_anim
setFrameRate
:
30
];
[
o_makekey_anim
setDelegate
:
self
];
[
o_makekey_anim
startAnimation
];
b_window_is_invisible
=
NO
;
/* fullscreenAnimation will be unlocked when animation ends */
}
#pragma mark -
#pragma mark split view delegate
-
(
CGFloat
)
splitView
:(
NSSplitView
*
)
splitView
constrainMaxCoordinate
:(
CGFloat
)
proposedMax
ofSubviewAt
:(
NSInteger
)
dividerIndex
...
...
modules/gui/macosx/Windows.m
View file @
f6c636ae
...
...
@@ -1049,6 +1049,55 @@
[
self
hasBecomeFullscreen
];
}
-
(
void
)
orderOut
:(
id
)
sender
{
[
super
orderOut
:
sender
];
/*
* TODO reimplement leaveFullscreenAndFadeOut:YES, or remove code
* and the hack below
if (![NSStringFromClass([self class]) isEqualToString:@"VLCMainWindow"]) {
[self leaveFullscreenAndFadeOut:YES];
}
*/
}
-
(
void
)
makeKeyAndOrderFront
:
(
id
)
sender
{
/* Hack
* when we exit fullscreen and fade out, we may endup in
* having a window that is faded. We can't have it fade in unless we
* animate again. */
if
(
!
b_window_is_invisible
)
{
/* Make sure we don't do it too much */
[
super
makeKeyAndOrderFront
:
sender
];
return
;
}
[
super
setAlphaValue
:
0
.
0
f
];
[
super
makeKeyAndOrderFront
:
sender
];
NSMutableDictionary
*
dict
=
[[
NSMutableDictionary
alloc
]
initWithCapacity
:
2
];
[
dict
setObject
:
self
forKey
:
NSViewAnimationTargetKey
];
[
dict
setObject
:
NSViewAnimationFadeInEffect
forKey
:
NSViewAnimationEffectKey
];
o_makekey_anim
=
[[
NSViewAnimation
alloc
]
initWithViewAnimations
:@[
dict
]];
[
dict
release
];
[
o_makekey_anim
setAnimationBlockingMode
:
NSAnimationNonblocking
];
[
o_makekey_anim
setDuration
:
0
.
1
];
[
o_makekey_anim
setFrameRate
:
30
];
[
o_makekey_anim
setDelegate
:
self
];
[
o_makekey_anim
startAnimation
];
b_window_is_invisible
=
NO
;
/* fullscreenAnimation will be unlocked when animation ends */
}
#pragma mark -
#pragma mark Accessibility stuff
...
...
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