Changeset f5f7c36c4351a71129e4d2f6e6a1d03823387713

Timestamp:

05/12/08 18:40:49 (2 months ago)

Author:

Felix Paul Kühne <fkuehne@videolan.org>

git-committer:

Felix Paul Kühne <fkuehne@videolan.org> 1210610449 +0200

git-parent:

[f5266ccf92db33ce9f6234de82b46b96f089e37d]

git-author:

Felix Paul Kühne <fkuehne@videolan.org> 1210610396 +0200

Message:

Make sure the window is set to a normal level before going to fullscreen.

This fixes the 'the fspanel is missing if I have always-on-top selected' bug and should also fix #1227 for OS X.

This patch needs testing on a multiscreen setup before being backported.

Files:

• modules/gui/macosx/vout.m (modified) (2 diffs)

modules/gui/macosx/vout.m

@@ -771 +771 @@
-- (void)enterFullscreen
-{
+    if( var_GetBool( p_real_vout, "video-on-top" ) )
+    {
+        [o_window setLevel: NSNormalWindowLevel];
+    }
+
-    [[o_view class] performSelectorOnMainThread:@selector(resetVout:) withObject:[NSValue valueWithPointer:p_vout] waitUntilDone:YES];
-    [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil];
@@ -777 +782 @@
-- (void)leaveFullscreen
-{
+    if( var_GetBool( p_real_vout, "video-on-top" ) )
+    {
+        [o_window setLevel: NSStatusWindowLevel];
+    }
+
-    [[o_view class] performSelectorOnMainThread:@selector(resetVout:) withObject:[NSValue valueWithPointer:p_vout] waitUntilDone:YES];
-    [[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil];