05fc8f4 refactor(webkit): extract bgColor helper to reduce duplication · dumber

A internal/infrastructure/webkit/bgcolor.go +38 -0

@@ -0,0 +1,38 @@
	1	+	package webkit
	2	+
	3	+	import (
	4	+	"sync"
	5	+
	6	+	"github.com/jwijenbergh/puregotk/v4/gdk"
	7	+	)
	8	+
	9	+	// bgColor holds RGBA components for WebView background color (eliminates white flash).
	10	+	// It is thread-safe and can be embedded in pool/factory structs.
	11	+	type bgColor struct {
	12	+	r, g, b, a float32
	13	+	mu sync.RWMutex
	14	+	}
	15	+
	16	+	// set stores the background color components.
	17	+	func (c *bgColor) set(r, g, b, a float32) {
	18	+	c.mu.Lock()
	19	+	c.r, c.g, c.b, c.a = r, g, b, a
	20	+	c.mu.Unlock()
	21	+	}
	22	+
	23	+	// get returns the background color components.
	24	+	func (c *bgColor) get() (r, g, b, a float32) {
	25	+	c.mu.RLock()
	26	+	r, g, b, a = c.r, c.g, c.b, c.a
	27	+	c.mu.RUnlock()
	28	+	return
	29	+	}
	30	+
	31	+	// toGdkRGBA returns a *gdk.RGBA if a valid color is configured (alpha > 0), nil otherwise.
	32	+	func (c bgColor) toGdkRGBA() gdk.RGBA {
	33	+	r, g, b, a := c.get()
	34	+	if a <= 0 {
	35	+	return nil
	36	+	}
	37	+	return &gdk.RGBA{Red: r, Green: g, Blue: b, Alpha: a}
	38	+	}

@@ -0,0 +1,38 @@
	1	+	package webkit
	2	+
	3	+	import (
	4	+	"sync"
	5	+
	6	+	"github.com/jwijenbergh/puregotk/v4/gdk"
	7	+	)
	8	+
	9	+	// bgColor holds RGBA components for WebView background color (eliminates white flash).
	10	+	// It is thread-safe and can be embedded in pool/factory structs.
	11	+	type bgColor struct {
	12	+	r, g, b, a float32
	13	+	mu sync.RWMutex
	14	+	}
	15	+
	16	+	// set stores the background color components.
	17	+	func (c *bgColor) set(r, g, b, a float32) {
	18	+	c.mu.Lock()
	19	+	c.r, c.g, c.b, c.a = r, g, b, a
	20	+	c.mu.Unlock()
	21	+	}
	22	+
	23	+	// get returns the background color components.
	24	+	func (c *bgColor) get() (r, g, b, a float32) {
	25	+	c.mu.RLock()
	26	+	r, g, b, a = c.r, c.g, c.b, c.a
	27	+	c.mu.RUnlock()
	28	+	return
	29	+	}
	30	+
	31	+	// toGdkRGBA returns a *gdk.RGBA if a valid color is configured (alpha > 0), nil otherwise.
	32	+	func (c bgColor) toGdkRGBA() gdk.RGBA {
	33	+	r, g, b, a := c.get()
	34	+	if a <= 0 {
	35	+	return nil
	36	+	}
	37	+	return &gdk.RGBA{Red: r, Green: g, Blue: b, Alpha: a}
	38	+	}

M internal/infrastructure/webkit/factory.go +4 -22


@@ -3,11 +3,9 @@ package webkit
3	3		import (
4	4		"context"
5	5		"fmt"
6		-	"sync"
7	6
8	7		"github.com/bnema/dumber/internal/application/port"
9	8		"github.com/bnema/dumber/internal/logging"
10		-	"github.com/jwijenbergh/puregotk/v4/gdk"
11	9		)
12	10
13	11		// WebViewFactory creates WebView instances for the application.

@@ -22,8 +20,7 @@ type WebViewFactory struct {
22	20		filterApplier FilterApplier // Optional content filter applier
23	21
24	22		// Background color for WebViews (eliminates white flash)
25		-	bgR, bgG, bgB, bgA float32
26		-	bgMu sync.RWMutex
	23	+	bg bgColor
27	24		}
28	25
29	26		// NewWebViewFactory creates a new WebViewFactory.

@@ -57,9 +54,7 @@ func (f *WebViewFactory) SetFilterApplier(applier FilterApplier) {
57	54		// SetBackgroundColor sets the background color for newly created WebViews.
58	55		// This color is shown before content is painted, eliminating white flash.
59	56		func (f *WebViewFactory) SetBackgroundColor(r, g, b, a float32) {
60		-	f.bgMu.Lock()
61		-	f.bgR, f.bgG, f.bgB, f.bgA = r, g, b, a
62		-	f.bgMu.Unlock()
	57	+	f.bg.set(r, g, b, a)
63	58		// Also propagate to the pool if present
64	59		if f.pool != nil {
65	60		f.pool.SetBackgroundColor(r, g, b, a)

@@ -107,10 +102,7 @@ func (f *WebViewFactory) CreateRelated(ctx context.Context, parentID port.WebVie
107	102		}
108	103
109	104		// Set background color to match theme (eliminates white flash)
110		-	f.bgMu.RLock()
111		-	r, g, b, a := f.bgR, f.bgG, f.bgB, f.bgA
112		-	f.bgMu.RUnlock()
113		-	if a > 0 {
	105	+	if r, g, b, a := f.bg.get(); a > 0 {
114	106		wv.SetBackgroundColor(r, g, b, a)
115	107		}
116	108

@@ -139,17 +131,7 @@ func (f *WebViewFactory) CreateRelated(ctx context.Context, parentID port.WebVie
139	131		func (f WebViewFactory) createDirect(ctx context.Context) (WebView, error) {
140	132		log := logging.FromContext(ctx)
141	133
142		-	// Build background color for immediate application during WebView creation
143		-	f.bgMu.RLock()
144		-	r, g, b, a := f.bgR, f.bgG, f.bgB, f.bgA
145		-	f.bgMu.RUnlock()
146		-
147		-	var bgColor *gdk.RGBA
148		-	if a > 0 { // Only set if a valid color was configured
149		-	bgColor = &gdk.RGBA{Red: r, Green: g, Blue: b, Alpha: a}
150		-	}
151		-
152		-	wv, err := NewWebView(ctx, f.wkCtx, f.settings, bgColor)
	134	+	wv, err := NewWebView(ctx, f.wkCtx, f.settings, f.bg.toGdkRGBA())
153	135		if err != nil {
154	136		return nil, err
155	137		}

 import (
 	"context"
 	"fmt"
-	"sync"
 	"github.com/bnema/dumber/internal/application/port"
 	"github.com/bnema/dumber/internal/logging"
-	"github.com/jwijenbergh/puregotk/v4/gdk"
 )
 // WebViewFactory creates WebView instances for the application.
 	filterApplier FilterApplier // Optional content filter applier
 	// Background color for WebViews (eliminates white flash)
-	bgR, bgG, bgB, bgA float32
+	bg bgColor
-	bgMu               sync.RWMutex
 }
 // NewWebViewFactory creates a new WebViewFactory.
 // SetBackgroundColor sets the background color for newly created WebViews.
 // This color is shown before content is painted, eliminating white flash.
 func (f *WebViewFactory) SetBackgroundColor(r, g, b, a float32) {
-	f.bgMu.Lock()
+	f.bg.set(r, g, b, a)
-	f.bgR, f.bgG, f.bgB, f.bgA = r, g, b, a
-	f.bgMu.Unlock()
 	// Also propagate to the pool if present
 	if f.pool != nil {
 		f.pool.SetBackgroundColor(r, g, b, a)
 	}
 	// Set background color to match theme (eliminates white flash)
-	f.bgMu.RLock()
+	if r, g, b, a := f.bg.get(); a > 0 {
-	r, g, b, a := f.bgR, f.bgG, f.bgB, f.bgA
-	f.bgMu.RUnlock()
-	if a > 0 {
 		wv.SetBackgroundColor(r, g, b, a)
 	}
 func (f *WebViewFactory) createDirect(ctx context.Context) (*WebView, error) {
 	log := logging.FromContext(ctx)
-	// Build background color for immediate application during WebView creation
+	wv, err := NewWebView(ctx, f.wkCtx, f.settings, f.bg.toGdkRGBA())
-	f.bgMu.RLock()
-	r, g, b, a := f.bgR, f.bgG, f.bgB, f.bgA
-	f.bgMu.RUnlock()
-	var bgColor *gdk.RGBA
-	if a > 0 { // Only set if a valid color was configured
-		bgColor = &gdk.RGBA{Red: r, Green: g, Blue: b, Alpha: a}
-	}
-	wv, err := NewWebView(ctx, f.wkCtx, f.settings, bgColor)
 	if err != nil {
 		return nil, err
 	}

M internal/infrastructure/webkit/pool.go +4 -21


@@ -9,7 +9,6 @@ import (
9	9
10	10		"github.com/bnema/dumber/internal/logging"
11	11		"github.com/bnema/puregotk-webkit/webkit"
12		-	"github.com/jwijenbergh/puregotk/v4/gdk"
13	12		"github.com/jwijenbergh/puregotk/v4/glib"
14	13		)
15	14

@@ -56,8 +55,7 @@ type WebViewPool struct {
56	55		filterApplier FilterApplier // Optional content filter applier
57	56
58	57		// Background color for WebViews (eliminates white flash)
59		-	bgR, bgG, bgB, bgA float32
60		-	bgMu sync.RWMutex
	58	+	bg bgColor
61	59
62	60		closed atomic.Bool
63	61		wg sync.WaitGroup

@@ -109,9 +107,7 @@ func (p *WebViewPool) SetFilterApplier(applier FilterApplier) {
109	107		// SetBackgroundColor sets the background color for newly created WebViews.
110	108		// This color is shown before content is painted, eliminating white flash.
111	109		func (p *WebViewPool) SetBackgroundColor(r, g, b, a float32) {
112		-	p.bgMu.Lock()
113		-	p.bgR, p.bgG, p.bgB, p.bgA = r, g, b, a
114		-	p.bgMu.Unlock()
	110	+	p.bg.set(r, g, b, a)
115	111		}
116	112
117	113		// Acquire gets a WebView from the pool or creates a new one.

@@ -126,10 +122,7 @@ func (p WebViewPool) Acquire(ctx context.Context) (WebView, error) {
126	122		select {
127	123		case wv := <-p.pool:
128	124		if wv != nil && !wv.IsDestroyed() {
129		-	p.bgMu.RLock()
130		-	r, g, b, a := p.bgR, p.bgG, p.bgB, p.bgA
131		-	p.bgMu.RUnlock()
132		-	if a > 0 {
	125	+	if r, g, b, a := p.bg.get(); a > 0 {
133	126		wv.SetBackgroundColor(r, g, b, a)
134	127		}
135	128		wv.inner.AddCssClass("webview-themed")

@@ -158,17 +151,7 @@ func (p WebViewPool) Acquire(ctx context.Context) (WebView, error) {
158	151		func (p WebViewPool) createWebView(ctx context.Context) (WebView, error) {
159	152		log := logging.FromContext(ctx)
160	153
161		-	// Build background color for immediate application during WebView creation
162		-	p.bgMu.RLock()
163		-	r, g, b, a := p.bgR, p.bgG, p.bgB, p.bgA
164		-	p.bgMu.RUnlock()
165		-
166		-	var bgColor *gdk.RGBA
167		-	if a > 0 { // Only set if a valid color was configured
168		-	bgColor = &gdk.RGBA{Red: r, Green: g, Blue: b, Alpha: a}
169		-	}
170		-
171		-	wv, err := NewWebView(ctx, p.wkCtx, p.settings, bgColor)
	154	+	wv, err := NewWebView(ctx, p.wkCtx, p.settings, p.bg.toGdkRGBA())
172	155		if err != nil {
173	156		return nil, err
174	157		}

 	"github.com/bnema/dumber/internal/logging"
 	"github.com/bnema/puregotk-webkit/webkit"
-	"github.com/jwijenbergh/puregotk/v4/gdk"
 	"github.com/jwijenbergh/puregotk/v4/glib"
 )
 	filterApplier FilterApplier // Optional content filter applier
 	// Background color for WebViews (eliminates white flash)
-	bgR, bgG, bgB, bgA float32
+	bg bgColor
-	bgMu               sync.RWMutex
 	closed atomic.Bool
 	wg     sync.WaitGroup
 // SetBackgroundColor sets the background color for newly created WebViews.
 // This color is shown before content is painted, eliminating white flash.
 func (p *WebViewPool) SetBackgroundColor(r, g, b, a float32) {
-	p.bgMu.Lock()
+	p.bg.set(r, g, b, a)
-	p.bgR, p.bgG, p.bgB, p.bgA = r, g, b, a
-	p.bgMu.Unlock()
 }
 // Acquire gets a WebView from the pool or creates a new one.
 	select {
 	case wv := <-p.pool:
 		if wv != nil && !wv.IsDestroyed() {
-			p.bgMu.RLock()
+			if r, g, b, a := p.bg.get(); a > 0 {
-			r, g, b, a := p.bgR, p.bgG, p.bgB, p.bgA
-			p.bgMu.RUnlock()
-			if a > 0 {
 				wv.SetBackgroundColor(r, g, b, a)
 			}
 			wv.inner.AddCssClass("webview-themed")
 func (p *WebViewPool) createWebView(ctx context.Context) (*WebView, error) {
 	log := logging.FromContext(ctx)
-	// Build background color for immediate application during WebView creation
+	wv, err := NewWebView(ctx, p.wkCtx, p.settings, p.bg.toGdkRGBA())
-	p.bgMu.RLock()
-	r, g, b, a := p.bgR, p.bgG, p.bgB, p.bgA
-	p.bgMu.RUnlock()
-	var bgColor *gdk.RGBA
-	if a > 0 { // Only set if a valid color was configured
-		bgColor = &gdk.RGBA{Red: r, Green: g, Blue: b, Alpha: a}
-	}
-	wv, err := NewWebView(ctx, p.wkCtx, p.settings, bgColor)
 	if err != nil {
 		return nil, err
 	}