From 7fbedf14e13109d40af17fb5e17c8b0411c02b4c Mon Sep 17 00:00:00 2001
From: David Fuhrmann <david.fuhrmann@googlemail.com>
Date: Sun, 29 Sep 2013 11:54:21 +0200
Subject: [PATCH] macosx: ensure that video view is always visible in
fullscreen window (close #9526)
---
modules/gui/macosx/Windows.h | 2 ++
modules/gui/macosx/Windows.m | 6 ++++++
2 files changed, 8 insertions(+)
diff --git a/modules/gui/macosx/Windows.h b/modules/gui/macosx/Windows.h
index 2dd7ad7f2afd..e110ba88ae80 100644
--- a/modules/gui/macosx/Windows.h
+++ b/modules/gui/macosx/Windows.h
@@ -105,6 +105,8 @@ static const float f_min_video_height = 70.0;
BOOL b_window_is_invisible;
NSInteger i_originalLevel;
+ BOOL b_video_view_was_hidden;
+
NSTimer *t_hide_mouse_timer;
// true when the window is in transition for entering lion fullscreen
diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m
index cec3a9efb83e..6094363a957d 100644
--- a/modules/gui/macosx/Windows.m
+++ b/modules/gui/macosx/Windows.m
@@ -813,6 +813,10 @@
return;
}
+ /* Make sure video view gets visible in case the playlist was visible before */
+ b_video_view_was_hidden = [o_video_view isHidden];
+ [o_video_view setHidden: NO];
+
/* Make sure we don't see the o_video_view disappearing of the screen during this operation */
NSDisableScreenUpdates();
[o_video_view retain];
@@ -1017,6 +1021,8 @@
if ([[o_video_view subviews] count] > 0)
[self makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];
+ [o_video_view setHidden: b_video_view_was_hidden];
+
[super makeKeyAndOrderFront:self]; /* our version (in main window) contains a workaround */
[o_fullscreen_window orderOut: self];
--
GitLab