Commit 39d525d8 authored by Sebastien Zwickert's avatar Sebastien Zwickert Committed by Pierre d'Herbemont

gui/macosx: uses the superview object for swapping between the video view and the temporary view.

Signed-off-by: default avatarPierre d'Herbemont <pdherbemont@free.fr>
parent b1198ae4
...@@ -445,7 +445,7 @@ ...@@ -445,7 +445,7 @@
if ([screen isMainScreen]) if ([screen isMainScreen])
SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
[[self contentView] replaceSubview:o_view with:o_temp_view]; [[o_view superview] replaceSubview:o_view with:o_temp_view];
[o_temp_view setFrame:[o_view frame]]; [o_temp_view setFrame:[o_view frame]];
[o_fullscreen_window setContentView:o_view]; [o_fullscreen_window setContentView:o_view];
...@@ -467,7 +467,7 @@ ...@@ -467,7 +467,7 @@
/* Make sure we don't see the o_view disappearing of the screen during this operation */ /* Make sure we don't see the o_view disappearing of the screen during this operation */
NSDisableScreenUpdates(); NSDisableScreenUpdates();
[[self contentView] replaceSubview:o_view with:o_temp_view]; [[o_view superview] replaceSubview:o_view with:o_temp_view];
[o_temp_view setFrame:[o_view frame]]; [o_temp_view setFrame:[o_view frame]];
[o_fullscreen_window setContentView:o_view]; [o_fullscreen_window setContentView:o_view];
[o_fullscreen_window makeKeyAndOrderFront:self]; [o_fullscreen_window makeKeyAndOrderFront:self];
...@@ -661,7 +661,7 @@ ...@@ -661,7 +661,7 @@
NSDisableScreenUpdates(); NSDisableScreenUpdates();
[o_view retain]; [o_view retain];
[o_view removeFromSuperviewWithoutNeedingDisplay]; [o_view removeFromSuperviewWithoutNeedingDisplay];
[[self contentView] replaceSubview:o_temp_view with:o_view]; [[o_temp_view superview] replaceSubview:o_temp_view with:o_view];
[o_view release]; [o_view release];
[o_view setFrame:[o_temp_view frame]]; [o_view setFrame:[o_temp_view frame]];
[self makeFirstResponder: o_view]; [self makeFirstResponder: o_view];
......
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