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
b0ac1fc6
Commit
b0ac1fc6
authored
Jan 15, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fixed fullscreen mode when linking against older SDKs (fixes #5857)
parent
7a28f193
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+5
-5
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+3
-0
No files found.
modules/gui/macosx/MainWindow.m
View file @
b0ac1fc6
...
...
@@ -121,10 +121,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
-
(
void
)
awakeFromNib
{
/* setup the styled interface */
#ifdef MAC_OS_X_VERSION_10_7
b_nativeFullscreenMode
=
config_GetInt
(
VLCIntf
,
"macosx-nativefullscreenmode"
);
#else
#ifndef MAC_OS_X_VERSION_10_7
b_nativeFullscreenMode
=
NO
;
#else
b_nativeFullscreenMode
=
config_GetInt
(
VLCIntf
,
"macosx-nativefullscreenmode"
);
#endif
i_lastShownVolume
=
-
1
;
t_hide_mouse_timer
=
nil
;
...
...
@@ -1491,7 +1491,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[
o_fullscreen_btn
setState
:
NO
];
/* We always try to do so */
if
(
!
(
OSX_LION
&&
b_nativeFullscreenMode
))
if
(
!
(
OSX_LION
||
!
b_nativeFullscreenMode
))
[
NSScreen
unblackoutScreens
];
vout_thread_t
*
p_vout
=
getVout
();
if
(
p_vout
)
...
...
@@ -1656,7 +1656,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
-
(
void
)
orderOut
:
(
id
)
sender
{
/* Make sure we leave fullscreen */
if
(
!
(
OSX_LION
&&
b_nativeFullscreenMode
))
if
(
!
(
OSX_LION
||
!
b_nativeFullscreenMode
))
[
self
leaveFullscreenAndFadeOut
:
YES
];
[
super
orderOut
:
sender
];
...
...
modules/gui/macosx/intf.m
View file @
b0ac1fc6
...
...
@@ -614,7 +614,10 @@ static VLCMain *_o_sharedMainInstance = nil;
[
o_msgs_refresh_btn
setImage
:
[
NSImage
imageNamed
:
NSImageNameRefreshTemplate
]];
/* yeah, we are done */
b_nativeFullscreenMode
=
NO
;
#ifdef MAC_OS_X_VERSION_10_7
b_nativeFullscreenMode
=
config_GetInt
(
p_intf
,
"macosx-nativefullscreenmode"
);
#endif
nib_main_loaded
=
TRUE
;
}
...
...
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