Commit 4bb0ca58 authored by David Fuhrmann's avatar David Fuhrmann Committed by Felix Paul Kühne

macosx vout: don't reset window state on close here

(cherry picked from commit 304a1c0a392212ef3cdc44481c190518956e6d27)
Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
parent ae66a777
...@@ -1603,6 +1603,9 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1603,6 +1603,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
[self makeFirstResponder: nil]; [self makeFirstResponder: nil];
[o_detached_video_window orderOut: nil]; [o_detached_video_window orderOut: nil];
if( [self level] != NSNormalWindowLevel )
[self setLevel: NSNormalWindowLevel];
// restore alpha value to 1 for the case that macosx-opaqueness is set to < 1 // restore alpha value to 1 for the case that macosx-opaqueness is set to < 1
[self setAlphaValue:1.0]; [self setAlphaValue:1.0];
} }
......
...@@ -257,9 +257,6 @@ void Close (vlc_object_t *this) ...@@ -257,9 +257,6 @@ void Close (vlc_object_t *this)
vout_display_t *vd = (vout_display_t *)this; vout_display_t *vd = (vout_display_t *)this;
vout_display_sys_t *sys = vd->sys; vout_display_sys_t *sys = vd->sys;
if ([[sys->glView window] level] != NSNormalWindowLevel)
[[sys->glView window] setLevel: NSNormalWindowLevel];
[sys->glView setVoutDisplay:nil]; [sys->glView setVoutDisplay:nil];
var_Destroy (vd, "drawable-nsobject"); var_Destroy (vd, "drawable-nsobject");
......
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