refactor(daemon): clarify floating geometry boundaries

commit: 883aaa92363de677cd1414bd616d952fe358821e
author: brice · 3mo ago · 2026-07-11 06:00 UTC
parent: 9dd5126
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

2 files · +10 -6

M internal/usecase/daemon/floating_render.go +4 -2


@@ -8,8 +8,10 @@ import (
8	8		)
9	9
10	10		// floatingGeometry describes a popup's outer frame and terminal content area.
11		-	// Committed geometry is tab-content-relative and origin-zero; Bounds and Inner
12		-	// are both relative to tab content.
	11	+	// Bounds and Inner always share the same coordinate space. Committed pane
	12	+	// geometry is origin-zero and tab-content-relative; composeFloatingFrame
	13	+	// translates both fields and returns/caches frame-absolute geometry. Callers
	14	+	// must not translate a composed or cached value again.
13	15		type floatingGeometry struct {
14	16		Bounds domain.Rect
15	17		Inner domain.Rect

 )
 // floatingGeometry describes a popup's outer frame and terminal content area.
-// Committed geometry is tab-content-relative and origin-zero; Bounds and Inner
+// Bounds and Inner always share the same coordinate space. Committed pane
-// are both relative to tab content.
+// geometry is origin-zero and tab-content-relative; composeFloatingFrame
+// translates both fields and returns/caches frame-absolute geometry. Callers
+// must not translate a composed or cached value again.
 type floatingGeometry struct {
 	Bounds domain.Rect
 	Inner  domain.Rect

M internal/usecase/daemon/floating_render_test.go +6 -4


@@ -309,14 +309,15 @@ func BenchmarkComposeFloatingFrameCached(b *testing.B) {
309	309		base := renderer.NewFrame(80, 24)
310	310		content := domain.Rect{Y: 1, Width: 80, Height: 22}
311	311		cfg := domain.FloatingConfig{Width: 80, Height: 80}
	312	+	desired := calculateContentFloatingGeometry(domain.Size{Cols: content.Width, Rows: content.Height}, cfg)
312	313		cache := &composedFrameCache{}
313		-	composeFloatingFrame(base, nil, p, 1, content, calculateContentFloatingGeometry(domain.Size{Cols: content.Width, Rows: content.Height}, cfg), tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
	314	+	composeFloatingFrame(base, nil, p, 1, content, desired, tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
314	315		p.screen.ClearDamage()
315	316
316	317		b.ReportAllocs()
317	318		b.ResetTimer()
318	319		for b.Loop() {
319		-	composeFloatingFrame(base, nil, p, 1, content, calculateContentFloatingGeometry(domain.Size{Cols: content.Width, Rows: content.Height}, cfg), tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
	320	+	composeFloatingFrame(base, nil, p, 1, content, desired, tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
320	321		}
321	322		}
322	323

@@ -326,12 +327,13 @@ func TestComposeFloatingFrameCachedDoesNotAllocate(t *testing.T) {
326	327		base := renderer.NewFrame(80, 24)
327	328		content := domain.Rect{Y: 1, Width: 80, Height: 22}
328	329		cfg := domain.FloatingConfig{Width: 80, Height: 80}
	330	+	desired := calculateContentFloatingGeometry(domain.Size{Cols: content.Width, Rows: content.Height}, cfg)
329	331		cache := &composedFrameCache{}
330		-	composeFloatingFrame(base, nil, p, 1, content, calculateContentFloatingGeometry(domain.Size{Cols: content.Width, Rows: content.Height}, cfg), tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
	332	+	composeFloatingFrame(base, nil, p, 1, content, desired, tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
331	333		p.screen.ClearDamage()
332	334
333	335		allocs := testing.AllocsPerRun(100, func() {
334		-	composeFloatingFrame(base, nil, p, 1, content, calculateContentFloatingGeometry(domain.Size{Cols: content.Width, Rows: content.Height}, cfg), tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
	336	+	composeFloatingFrame(base, nil, p, 1, content, desired, tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
335	337		})
336	338		require.Zero(t, allocs, "cached floating composition must not allocate without damage or title changes")
337	339		}

 	base := renderer.NewFrame(80, 24)
 	content := domain.Rect{Y: 1, Width: 80, Height: 22}
 	cfg := domain.FloatingConfig{Width: 80, Height: 80}
+	desired := calculateContentFloatingGeometry(domain.Size{Cols: content.Width, Rows: content.Height}, cfg)
 	cache := &composedFrameCache{}
-	composeFloatingFrame(base, nil, p, 1, content, calculateContentFloatingGeometry(domain.Size{Cols: content.Width, Rows: content.Height}, cfg), tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
+	composeFloatingFrame(base, nil, p, 1, content, desired, tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
 	p.screen.ClearDamage()
 	b.ReportAllocs()
 	b.ResetTimer()
 	for b.Loop() {
-		composeFloatingFrame(base, nil, p, 1, content, calculateContentFloatingGeometry(domain.Size{Cols: content.Width, Rows: content.Height}, cfg), tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
+		composeFloatingFrame(base, nil, p, 1, content, desired, tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
 	}
 }
 	base := renderer.NewFrame(80, 24)
 	content := domain.Rect{Y: 1, Width: 80, Height: 22}
 	cfg := domain.FloatingConfig{Width: 80, Height: 80}
+	desired := calculateContentFloatingGeometry(domain.Size{Cols: content.Width, Rows: content.Height}, cfg)
 	cache := &composedFrameCache{}
-	composeFloatingFrame(base, nil, p, 1, content, calculateContentFloatingGeometry(domain.Size{Cols: content.Width, Rows: content.Height}, cfg), tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
+	composeFloatingFrame(base, nil, p, 1, content, desired, tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
 	p.screen.ClearDamage()
 	allocs := testing.AllocsPerRun(100, func() {
-		composeFloatingFrame(base, nil, p, 1, content, calculateContentFloatingGeometry(domain.Size{Cols: content.Width, Rows: content.Height}, cfg), tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
+		composeFloatingFrame(base, nil, p, 1, content, desired, tabLayoutSnapshot{}, themeui.Theme{}, cache, false)
 	})
 	require.Zero(t, allocs, "cached floating composition must not allocate without damage or title changes")
 }