Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
4ebe9811
Commit
4ebe9811
authored
Jul 28, 2013
by
David Fuhrmann
Browse files
always hide menu bar for fullscreen on osx redacted (fixes #9040)
parent
b56c7ee2
Changes
3
Hide whitespace changes
Inline
Side-by-side
modules/gui/macosx/CompatibilityFixes.h
View file @
4ebe9811
...
@@ -27,7 +27,8 @@
...
@@ -27,7 +27,8 @@
#pragma OS detection code
#pragma OS detection code
#define OSX_SNOW_LEOPARD (NSAppKitVersionNumber < 1115 && NSAppKitVersionNumber >= 1038)
#define OSX_SNOW_LEOPARD (NSAppKitVersionNumber < 1115 && NSAppKitVersionNumber >= 1038)
#define OSX_LION (NSAppKitVersionNumber < 1162 && NSAppKitVersionNumber >= 1115.2)
#define OSX_LION (NSAppKitVersionNumber < 1162 && NSAppKitVersionNumber >= 1115.2)
#define OSX_MOUNTAIN_LION NSAppKitVersionNumber >= 1162
#define OSX_MOUNTAIN_LION (NSAppKitVersionNumber < 1244 && NSAppKitVersionNumber >= 1162)
#define OSX_REDACTED NSAppKitVersionNumber >= 1244
#pragma mark -
#pragma mark -
#pragma Fixes for OS X Snow Leopard (10.6)
#pragma Fixes for OS X Snow Leopard (10.6)
...
...
modules/gui/macosx/intf.m
View file @
4ebe9811
...
@@ -1511,7 +1511,7 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -1511,7 +1511,7 @@ static VLCMain *_o_sharedMainInstance = nil;
IOReturn
success
;
IOReturn
success
;
/* work-around a bug in 10.7.4 and 10.7.5, so check for 10.7.x < 10.7.4, 10.8 and 10.6 */
/* work-around a bug in 10.7.4 and 10.7.5, so check for 10.7.x < 10.7.4, 10.8 and 10.6 */
if
((
NSAppKitVersionNumber
>=
1115
.
2
&&
NSAppKitVersionNumber
<
1138
.
45
)
||
OSX_MOUNTAIN_LION
||
OSX_SNOW_LEOPARD
)
{
if
((
NSAppKitVersionNumber
>=
1115
.
2
&&
NSAppKitVersionNumber
<
1138
.
45
)
||
OSX_MOUNTAIN_LION
||
OSX_REDACTED
||
OSX_SNOW_LEOPARD
)
{
CFStringRef
reasonForActivity
=
CFStringCreateWithCString
(
kCFAllocatorDefault
,
_
(
"VLC media playback"
),
kCFStringEncodingUTF8
);
CFStringRef
reasonForActivity
=
CFStringCreateWithCString
(
kCFAllocatorDefault
,
_
(
"VLC media playback"
),
kCFStringEncodingUTF8
);
if
([
self
activeVideoPlayback
])
if
([
self
activeVideoPlayback
])
success
=
IOPMAssertionCreateWithName
(
kIOPMAssertionTypeNoDisplaySleep
,
kIOPMAssertionLevelOn
,
reasonForActivity
,
&
systemSleepAssertionID
);
success
=
IOPMAssertionCreateWithName
(
kIOPMAssertionTypeNoDisplaySleep
,
kIOPMAssertionLevelOn
,
reasonForActivity
,
&
systemSleepAssertionID
);
...
@@ -1778,7 +1778,7 @@ static VLCMain *_o_sharedMainInstance = nil;
...
@@ -1778,7 +1778,7 @@ static VLCMain *_o_sharedMainInstance = nil;
-
(
NSString
*
)
latestCrashLogPathPreviouslySeen
:(
BOOL
)
previouslySeen
-
(
NSString
*
)
latestCrashLogPathPreviouslySeen
:(
BOOL
)
previouslySeen
{
{
NSString
*
crashReporter
;
NSString
*
crashReporter
;
if
(
OSX_MOUNTAIN_LION
)
if
(
OSX_MOUNTAIN_LION
||
OSX_REDACTED
)
crashReporter
=
[
@"~/Library/Logs/DiagnosticReports"
stringByExpandingTildeInPath
];
crashReporter
=
[
@"~/Library/Logs/DiagnosticReports"
stringByExpandingTildeInPath
];
else
else
crashReporter
=
[
@"~/Library/Logs/CrashReporter"
stringByExpandingTildeInPath
];
crashReporter
=
[
@"~/Library/Logs/CrashReporter"
stringByExpandingTildeInPath
];
...
...
modules/gui/macosx/misc.m
View file @
4ebe9811
...
@@ -185,7 +185,10 @@ static NSMutableArray *blackoutWindows = NULL;
...
@@ -185,7 +185,10 @@ static NSMutableArray *blackoutWindows = NULL;
-
(
BOOL
)
hasMenuBar
-
(
BOOL
)
hasMenuBar
{
{
return
([
self
displayID
]
==
[[[
NSScreen
screens
]
objectAtIndex
:
0
]
displayID
]);
if
(
OSX_REDACTED
)
return
YES
;
else
return
([
self
displayID
]
==
[[[
NSScreen
screens
]
objectAtIndex
:
0
]
displayID
]);
}
}
-
(
BOOL
)
hasDock
-
(
BOOL
)
hasDock
...
...
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