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
5003db86
Commit
5003db86
authored
May 17, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: remove debug code and block Lion's fullscreen mode when disabling 'video-deco'
Thanks to David Fuhrmann for the remarks
parent
3131d924
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
9 deletions
+3
-9
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+3
-9
No files found.
modules/gui/macosx/MainWindow.m
View file @
5003db86
...
...
@@ -128,11 +128,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
/* setup the styled interface */
b_video_deco
=
config_GetInt
(
VLCIntf
,
"video-deco"
);
if
(
b_video_deco
)
b_nonembedded
=
YES
;
b_nativeFullscreenMode
=
NO
;
#ifdef MAC_OS_X_VERSION_10_7
if
(
OSX_LION
)
if
(
OSX_LION
&&
b_video_deco
)
b_nativeFullscreenMode
=
config_GetInt
(
VLCIntf
,
"macosx-nativefullscreenmode"
);
#endif
i_lastShownVolume
=
-
1
;
...
...
@@ -2667,6 +2665,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
backing
:(
NSBackingStoreType
)
backingType
defer
:(
BOOL
)
flag
{
b_dark_interface
=
config_GetInt
(
VLCIntf
,
"macosx-interfacestyle"
);
b_video_deco
=
config_GetInt
(
VLCIntf
,
"video-deco"
);
if
(
b_dark_interface
||
!
b_video_deco
)
{
...
...
@@ -2680,12 +2679,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
#endif
}
b_video_deco
=
config_GetInt
(
VLCIntf
,
"video-deco"
);
if
(
b_video_deco
)
self
=
[
super
initWithContentRect
:
contentRect
styleMask
:
styleMask
backing:
backingType
defer
:
flag
];
else
self
=
[
super
initWithContentRect
:
contentRect
styleMask
:
styleMask
self
=
[
super
initWithContentRect
:
contentRect
styleMask
:
styleMask
backing:
backingType
defer
:
flag
];
/* we want to be moveable regardless of our style */
...
...
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