marketing-shibata50/cmux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix browser pane video fullscreen

Browse source
This commit is contained in:
austinpower1258 2026-03-21 12:17:55 -07:00
parent 6ff81579d9
commit e935eb57d3
4 changed files with 97 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Sources/Panels/BrowserPanelView.swift
View file

@ -5774,6 +5774,13 @@ struct WebViewRepresentable: NSViewRepresentable {
host.clearLocalInlineCallbacks()
}
private static func shouldPreserveExternalFullscreenHost(
for webView: WKWebView,
relativeTo expectedWindow: NSWindow?
) -> Bool {
webView.cmuxIsManagedByExternalFullscreenWindow(relativeTo: expectedWindow)
}
private static func localInlineTransferRoot(for webView: WKWebView) -> NSView? {
var current = webView.superview
var last: NSView?
@ -5874,7 +5881,12 @@ struct WebViewRepresentable: NSViewRepresentable {
guard let host = nsView as? HostContainerView else { return false }
let slotView = host.ensureLocalInlineSlotView()
let isAlreadyInLocalHost = host.containsManagedLocalInlineContent(webView)
let didAttachWebViewToLocalHost = !isAlreadyInLocalHost
let shouldPreserveExternalFullscreenHost = Self.shouldPreserveExternalFullscreenHost(
for: webView,
relativeTo: host.window
)
let didAttachWebViewToLocalHost =
!isAlreadyInLocalHost && !shouldPreserveExternalFullscreenHost
let coordinator = context.coordinator
coordinator.desiredPortalVisibleInUI = false
@ -5919,6 +5931,16 @@ struct WebViewRepresentable: NSViewRepresentable {
return false
}
#if DEBUG
if shouldPreserveExternalFullscreenHost {
dlog(
"browser.localHost.reparent.skip web=\(Self.objectID(webView)) " +
"reason=fullscreenExternalHost host=\(Self.objectID(host)) " +
"slot=\(Self.objectID(slotView)) state=\(String(describing: webView.fullscreenState))"
)
}
#endif
let preferredAttachedWidthState = panel.preferredAttachedDeveloperToolsWidthState()
host.setPreferredHostedInspectorWidth(
width: preferredAttachedWidthState.width,
@ -5971,7 +5993,7 @@ struct WebViewRepresentable: NSViewRepresentable {
host.setHostedInspectorFrontendWebView(webView.cmuxInspectorFrontendWebView())
host.scheduleHostedInspectorDockConfigurationSync(reason: "localInline.update.async")
}
} else {
} else if !shouldPreserveExternalFullscreenHost {
panel.consumeAttachedDeveloperToolsManualCloseIfNeeded()
host.scheduleHostedInspectorDockConfigurationSync(reason: "localInline.update")
}
@ -5985,7 +6007,7 @@ struct WebViewRepresentable: NSViewRepresentable {
details: Self.attachContext(webView: webView, host: host)
)
#endif
return true
return !shouldPreserveExternalFullscreenHost
}
private func updateUsingWindowPortal(_ nsView: NSView, context: Context, webView: WKWebView) -> Bool {
@ -5993,6 +6015,10 @@ struct WebViewRepresentable: NSViewRepresentable {
host.prepareForWindowPortalHosting()
host.setLocalInlineSlotHidden(true)
host.releaseHostedWebViewConstraints()
let shouldPreserveExternalFullscreenHost = Self.shouldPreserveExternalFullscreenHost(
for: webView,
relativeTo: host.window
)
let coordinator = context.coordinator
let paneDropContext = currentPaneDropContext()
@ -6188,7 +6214,7 @@ struct WebViewRepresentable: NSViewRepresentable {
details: Self.attachContext(webView: webView, host: host)
)
#endif
return portalHostAccepted
return portalHostAccepted && !shouldPreserveExternalFullscreenHost
}
func updateNSView(_ nsView: NSView, context: Context) {