From 57fa1c52b7e307f49fcbc0cf8b75526651685339 Mon Sep 17 00:00:00 2001 From: Tobias Taschner Date: Mon, 8 Mar 2021 11:42:02 +0100 Subject: [PATCH] macOS: Implement wxWebView fullscreen API --- src/osx/webview_webkit.mm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm index 1457ece981..262409ad05 100644 --- a/src/osx/webview_webkit.mm +++ b/src/osx/webview_webkit.mm @@ -123,6 +123,12 @@ bool wxWebViewWebKit::Create(wxWindow *parent, NSRect r = wxOSXGetFrameForControl( this, pos , size ) ; WKWebViewConfiguration* webViewConfig = [[WKWebViewConfiguration alloc] init]; + + // WebKit API available since macOS 10.11 and iOS 9.0 + SEL fullScreenSelector = @selector(_setFullScreenEnabled:); + if ([webViewConfig.preferences respondsToSelector:fullScreenSelector]) + [webViewConfig.preferences performSelector:fullScreenSelector withObject:[NSNumber numberWithBool:YES]]; + if (!m_handlers.empty()) { #if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13 @@ -162,6 +168,11 @@ bool wxWebViewWebKit::Create(wxWindow *parent, [m_webView setUIDelegate:uiDelegate]; + // WebKit API available since macOS 10.13 and iOS 11.0 + SEL fullScreenDelegateSelector = @selector(_setFullscreenDelegate:); + if ([m_webView respondsToSelector:fullScreenDelegateSelector]) + [m_webView performSelector:fullScreenDelegateSelector withObject:uiDelegate]; + m_UIDelegate = uiDelegate; LoadURL(strURL); @@ -942,6 +953,25 @@ WX_API_AVAILABLE_MACOS(10, 12) webKitWindow->Print(); } +- (void)SendFullscreenChangedEvent:(int)status +{ + wxWebViewEvent event(wxEVT_WEBVIEW_FULLSCREEN_CHANGED, webKitWindow->GetId(), + webKitWindow->GetCurrentURL(), wxString()); + event.SetEventObject(webKitWindow); + event.SetInt(status); + webKitWindow->HandleWindowEvent(event); +} + +- (void)_webViewDidEnterFullscreen:(WKWebView *)webView +{ + [self SendFullscreenChangedEvent:1]; +} + +- (void)_webViewDidExitFullscreen:(WKWebView *)webView +{ + [self SendFullscreenChangedEvent:0]; +} + @end @implementation WebViewScriptMessageHandler