refactor(browser): migrate workspace_manager.go to gotk4 API

commit: 44a691411ac1ce95715fd2ed1c4bf3047e91c23f
author: bamen · 12mo ago · 2025-10-09 05:26 UTC
parent: 143d1f0
signature: unsigned

1 file · +14 -13

M internal/app/browser/workspace_manager.go +14 -13


@@ -12,6 +12,7 @@ import (
12	12
13	13		"github.com/bnema/dumber/internal/app/messaging"
14	14		"github.com/bnema/dumber/pkg/webkit"
	15	+	"github.com/diamondburned/gotk4/pkg/glib/v2"
15	16		)
16	17
17	18		// WorkspaceManager coordinates Zellij-style pane operations.

@@ -271,8 +272,8 @@ func (wm WorkspaceManager) OnWorkspaceMessage(source webkit.WebView, msg messa
271	272		if err != nil {
272	273		log.Printf("[workspace] split failed: %v", err)
273	274		// CRITICAL FIX: Pump GTK events after validation failure to clear pending operations
274		-	if webkit.IsMainThread() {
275		-	webkit.IterateMainLoop()
	275	+	if glib.MainContextDefault().IsOwner() {
	276	+	glib.MainContextDefault().Iteration(false)
276	277		}
277	278		return
278	279		}

@@ -307,8 +308,8 @@ func (wm WorkspaceManager) OnWorkspaceMessage(source webkit.WebView, msg messa
307	308		if err != nil {
308	309		log.Printf("[workspace] stack failed: %v", err)
309	310		// CRITICAL FIX: Pump GTK events after stack failure
310		-	if webkit.IsMainThread() {
311		-	webkit.IterateMainLoop()
	311	+	if glib.MainContextDefault().IsOwner() {
	312	+	glib.MainContextDefault().Iteration(false)
312	313		}
313	314		return
314	315		}

@@ -459,29 +460,29 @@ func (wm WorkspaceManager) OnWorkspaceMessage(source webkit.WebView, msg messa
459	460		// The parent pane's rendering can become corrupted after popup closes
460	461		if targetNode.parentPane != nil {
461	462		parentNode := targetNode.parentPane
462		-	if parentNode.container != 0 && webkit.WidgetIsValid(parentNode.container) {
	463	+	if parentNode.container != nil {
463	464		log.Printf("[workspace] Fixing parent pane rendering after popup close")
464	465
465	466		// CRITICAL: Hide parent container to disconnect WebKitGTK rendering pipeline
466		-	webkit.WidgetHide(parentNode.container)
	467	+	parentNode.container.Hide()
467	468
468	469		// Schedule showing and forcing GTK to reconnect rendering
469	470		wm.scheduleIdleGuarded(func() bool {
470		-	if parentNode == nil \|\| !parentNode.widgetValid \|\| parentNode.container == 0 {
	471	+	if parentNode == nil \|\| !parentNode.widgetValid \|\| parentNode.container == nil {
471	472		return false
472	473		}
473	474		// Show widget to reconnect WebKit rendering pipeline
474		-	webkit.WidgetShow(parentNode.container)
	475	+	parentNode.container.Show()
475	476		// Force GTK to recalculate size and recreate rendering surface
476		-	webkit.WidgetQueueResize(parentNode.container)
477		-	webkit.WidgetQueueDraw(parentNode.container)
	477	+	parentNode.container.QueueResize()
	478	+	parentNode.container.QueueDraw()
478	479
479	480		// Also queue resize+draw on the WebView widget itself
480	481		if parentNode.pane != nil && parentNode.pane.WebView() != nil {
481	482		webViewWidget := parentNode.pane.WebView().Widget()
482		-	if webViewWidget != 0 && webkit.WidgetIsValid(webViewWidget) {
483		-	webkit.WidgetQueueResize(webViewWidget)
484		-	webkit.WidgetQueueDraw(webViewWidget)
	483	+	if webViewWidget != nil {
	484	+	webViewWidget.QueueResize()
	485	+	webViewWidget.QueueDraw()
485	486		log.Printf("[workspace] Queued resize+draw for parent WebView widget")
486	487		}
487	488		}

 	"github.com/bnema/dumber/internal/app/messaging"
 	"github.com/bnema/dumber/pkg/webkit"
+	"github.com/diamondburned/gotk4/pkg/glib/v2"
 )
 // WorkspaceManager coordinates Zellij-style pane operations.
 		if err != nil {
 			log.Printf("[workspace] split failed: %v", err)
 			// CRITICAL FIX: Pump GTK events after validation failure to clear pending operations
-			if webkit.IsMainThread() {
+			if glib.MainContextDefault().IsOwner() {
-				webkit.IterateMainLoop()
+				glib.MainContextDefault().Iteration(false)
 			}
 			return
 		}
 		if err != nil {
 			log.Printf("[workspace] stack failed: %v", err)
 			// CRITICAL FIX: Pump GTK events after stack failure
-			if webkit.IsMainThread() {
+			if glib.MainContextDefault().IsOwner() {
-				webkit.IterateMainLoop()
+				glib.MainContextDefault().Iteration(false)
 			}
 			return
 		}
 			// The parent pane's rendering can become corrupted after popup closes
 			if targetNode.parentPane != nil {
 				parentNode := targetNode.parentPane
-				if parentNode.container != 0 && webkit.WidgetIsValid(parentNode.container) {
+				if parentNode.container != nil {
 					log.Printf("[workspace] Fixing parent pane rendering after popup close")
 					// CRITICAL: Hide parent container to disconnect WebKitGTK rendering pipeline
-					webkit.WidgetHide(parentNode.container)
+					parentNode.container.Hide()
 					// Schedule showing and forcing GTK to reconnect rendering
 					wm.scheduleIdleGuarded(func() bool {
-						if parentNode == nil || !parentNode.widgetValid || parentNode.container == 0 {
+						if parentNode == nil || !parentNode.widgetValid || parentNode.container == nil {
 							return false
 						}
 						// Show widget to reconnect WebKit rendering pipeline
-						webkit.WidgetShow(parentNode.container)
+						parentNode.container.Show()
 						// Force GTK to recalculate size and recreate rendering surface
-						webkit.WidgetQueueResize(parentNode.container)
+						parentNode.container.QueueResize()
-						webkit.WidgetQueueDraw(parentNode.container)
+						parentNode.container.QueueDraw()
 						// Also queue resize+draw on the WebView widget itself
 						if parentNode.pane != nil && parentNode.pane.WebView() != nil {
 							webViewWidget := parentNode.pane.WebView().Widget()
-							if webViewWidget != 0 && webkit.WidgetIsValid(webViewWidget) {
+							if webViewWidget != nil {
-								webkit.WidgetQueueResize(webViewWidget)
+								webViewWidget.QueueResize()
-								webkit.WidgetQueueDraw(webViewWidget)
+								webViewWidget.QueueDraw()
 								log.Printf("[workspace] Queued resize+draw for parent WebView widget")
 							}
 						}