Skip to content

V
vlc-gpu
Commit cdd7a21b authored by David Fuhrmann's avatar David Fuhrmann
Browse files
Options

macosx: fix bug which hides fspanel when video on top is enabled 

close #8110
parent e553d8c4
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
modules/gui/macosx/MainWindow.m
View file @ cdd7a21b
...@@ -1626,10 +1626,13 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1626,10 +1626,13 @@ static VLCMainWindow *_o_sharedInstance = nil;
if (p_vout) if (p_vout)
{ {
if( var_GetBool( p_vout, "video-on-top" ) ) if( !b_fullscreen )
[[o_video_view window] setLevel: NSStatusWindowLevel]; {
else if( var_GetBool( p_vout, "video-on-top" ) )
[[o_video_view window] setLevel: NSNormalWindowLevel]; [[o_video_view window] setLevel: NSStatusWindowLevel];
else
[[o_video_view window] setLevel: NSNormalWindowLevel];
}
vlc_object_release( p_vout ); vlc_object_release( p_vout );
} }
} }
......
modules/gui/macosx/intf.m
View file @ cdd7a21b
...@@ -1707,6 +1707,9 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -1707,6 +1707,9 @@ unsigned int CocoaKeyToVLC( unichar i_key )
- (void)setWindowLevel:(NSNumber*)state - (void)setWindowLevel:(NSNumber*)state
{ {
if ([[VLCMainWindow sharedInstance] isFullscreen])
return;
if ([state unsignedIntValue] & VOUT_WINDOW_STATE_ABOVE) if ([state unsignedIntValue] & VOUT_WINDOW_STATE_ABOVE)
[[[[VLCMainWindow sharedInstance] videoView] window] setLevel: NSStatusWindowLevel]; [[[[VLCMainWindow sharedInstance] videoView] window] setLevel: NSStatusWindowLevel];
else else
......
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