Commit 8f49ba02 authored by David Fuhrmann's avatar David Fuhrmann

macosx: add implementation for "macosx-opaqueness"

(cherry picked from commit a4a14d8bce9ef70ca4a85a6cdcb5d41643db0b6e)
Signed-off-by: default avatarDavid Fuhrmann <david.fuhrmann@googlemail.com>
parent 080540ae
...@@ -1404,6 +1404,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1404,6 +1404,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
b_nonembedded = YES; b_nonembedded = YES;
} }
[[o_video_view window] makeKeyAndOrderFront: self]; [[o_video_view window] makeKeyAndOrderFront: self];
[[o_video_view window] setAlphaValue: config_GetFloat( VLCIntf, "macosx-opaqueness" )];
if (p_vout) if (p_vout)
{ {
...@@ -1421,7 +1422,13 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1421,7 +1422,13 @@ static VLCMainWindow *_o_sharedInstance = nil;
BOOL b_videoPlayback = [[VLCMain sharedInstance] activeVideoPlayback]; BOOL b_videoPlayback = [[VLCMain sharedInstance] activeVideoPlayback];
if (!b_videoPlayback) if (!b_videoPlayback)
{
[o_detached_video_window orderOut: nil]; [o_detached_video_window orderOut: nil];
// restore alpha value to 1 for the case that macosx-opaqueness is set to < 1
[self setAlphaValue:1.0];
}
if( b_nativeFullscreenMode ) if( b_nativeFullscreenMode )
{ {
if( [NSApp presentationOptions] & NSApplicationPresentationFullScreen ) if( [NSApp presentationOptions] & NSApplicationPresentationFullScreen )
...@@ -1880,6 +1887,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1880,6 +1887,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_fullscreen_window release]; [o_fullscreen_window release];
o_fullscreen_window = nil; o_fullscreen_window = nil;
[[o_video_view window] setLevel:i_originalLevel]; [[o_video_view window] setLevel:i_originalLevel];
[[o_video_view window] setAlphaValue: config_GetFloat( VLCIntf, "macosx-opaqueness" )];
// if we quit fullscreen because there is no video anymore, make sure non-embedded window is not visible // if we quit fullscreen because there is no video anymore, make sure non-embedded window is not visible
if( ![[VLCMain sharedInstance] activeVideoPlayback] && b_nonembedded ) if( ![[VLCMain sharedInstance] activeVideoPlayback] && b_nonembedded )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment