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
03e70c71
Commit
03e70c71
authored
Mar 01, 2014
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: add NSFullScreenWindowMask to compatibilityFixes.h and avoid NSAnimationContext warning
parent
56046780
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
modules/gui/macosx/CompatibilityFixes.h
modules/gui/macosx/CompatibilityFixes.h
+8
-0
modules/gui/macosx/Windows.m
modules/gui/macosx/Windows.m
+0
-2
No files found.
modules/gui/macosx/CompatibilityFixes.h
View file @
03e70c71
...
@@ -44,6 +44,10 @@ enum {
...
@@ -44,6 +44,10 @@ enum {
NSApplicationPresentationAutoHideToolbar
=
(
1
<<
11
)
NSApplicationPresentationAutoHideToolbar
=
(
1
<<
11
)
};
};
enum
{
NSFullScreenWindowMask
=
1
<<
14
};
enum
{
enum
{
NSWindowAnimationBehaviorDefault
=
0
,
// let AppKit infer animation behavior for this window
NSWindowAnimationBehaviorDefault
=
0
,
// let AppKit infer animation behavior for this window
NSWindowAnimationBehaviorNone
=
2
,
// suppress inferred animations (don't animate)
NSWindowAnimationBehaviorNone
=
2
,
// suppress inferred animations (don't animate)
...
@@ -67,4 +71,8 @@ typedef NSInteger NSWindowAnimationBehavior;
...
@@ -67,4 +71,8 @@ typedef NSInteger NSWindowAnimationBehavior;
-
(
BOOL
)
isDirectionInvertedFromDevice
;
-
(
BOOL
)
isDirectionInvertedFromDevice
;
@end
@end
@interface
NSAnimationContext
(
IntroducedInLion
)
+
(
void
)
runAnimationGroup
:(
void
(
^
)(
NSAnimationContext
*
context
))
changes
completionHandler
:(
void
(
^
)(
void
))
completionHandler
;
@end
#endif
#endif
modules/gui/macosx/Windows.m
View file @
03e70c71
...
@@ -661,7 +661,6 @@
...
@@ -661,7 +661,6 @@
[[[
VLCMainWindow
sharedInstance
]
fsPanel
]
setNonActive
:
nil
];
[[[
VLCMainWindow
sharedInstance
]
fsPanel
]
setNonActive
:
nil
];
}
}
#ifdef MAC_OS_X_VERSION_10_7
-
(
NSArray
*
)
customWindowsToEnterFullScreenForWindow
:(
NSWindow
*
)
window
-
(
NSArray
*
)
customWindowsToEnterFullScreenForWindow
:(
NSWindow
*
)
window
{
{
if
(
window
==
self
)
{
if
(
window
==
self
)
{
...
@@ -703,7 +702,6 @@
...
@@ -703,7 +702,6 @@
[[
window
animator
]
setFrame
:
frameBeforeLionFullscreen
display
:
YES
animate
:
YES
];
[[
window
animator
]
setFrame
:
frameBeforeLionFullscreen
display
:
YES
animate
:
YES
];
}
completionHandler
:
nil
];
}
completionHandler
:
nil
];
}
}
#endif
-
(
void
)
windowWillEnterFullScreen
:(
NSNotification
*
)
notification
-
(
void
)
windowWillEnterFullScreen
:(
NSNotification
*
)
notification
{
{
...
...
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