refactor(daemon): remove obsolete picker composer
- commit
- 72230e6c9e396989b5b455a3e0f6f526c9d95ad0
- author
- brice · · 2026-07-12 05:19 UTC
- parent
- ef057e1
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
2 files · +0 -23
M internal/usecase/daemon/picker.go +0 -15
| @@ -496,21 +496,6 @@ func (d *Daemon) refreshPicker(ac *attachedClient) { | |||
| 496 | 496 | d.registerPreviewForSelection(ac) | |
| 497 | 497 | } | |
| 498 | 498 | ||
| 499 | - | func composePickerClientFrame(model *picker.Model, preview picker.Preview, base renderer.Frame, styles ...themeStyles) (renderer.Frame, []renderer.Damage) { | |
| 500 | - | styleSet := resolveThemeStyles(styles) | |
| 501 | - | renderStyles := picker.RenderStyles{ | |
| 502 | - | Selection: styleSet.selection, | |
| 503 | - | SelectionName: styleSet.pickerSelectionName, | |
| 504 | - | SelectionMuted: styleSet.pickerSelectionMuted, | |
| 505 | - | Name: styleSet.pickerName, | |
| 506 | - | Detail: styleSet.paletteDesc, | |
| 507 | - | Base: renderer.DefaultStyle(), | |
| 508 | - | } | |
| 509 | - | return composeModalClientFrame(base, pickerModal, styleSet, styleSet.selection, func(size domain.Size, _ ...renderer.Style) renderer.Frame { | |
| 510 | - | return model.Render(size, preview, renderStyles) | |
| 511 | - | }) | |
| 512 | - | } | |
| 513 | - | ||
| 514 | 499 | func snapshotPickerPreview(tb *tab) picker.Preview { | |
| 515 | 500 | if tb == nil { | |
| 516 | 501 | return picker.Preview{} | |
| @@ -496,21 +496,6 @@ func (d *Daemon) refreshPicker(ac *attachedClient) { | |||||
| 496 | d.registerPreviewForSelection(ac) | 496 | d.registerPreviewForSelection(ac) | ||
| 497 | } | 497 | } | ||
| 498 | 498 | ||||
| 499 | - | func composePickerClientFrame(model *picker.Model, preview picker.Preview, base renderer.Frame, styles ...themeStyles) (renderer.Frame, []renderer.Damage) { | |||
| 500 | - | styleSet := resolveThemeStyles(styles) | |||
| 501 | - | renderStyles := picker.RenderStyles{ | |||
| 502 | - | Selection: styleSet.selection, | |||
| 503 | - | SelectionName: styleSet.pickerSelectionName, | |||
| 504 | - | SelectionMuted: styleSet.pickerSelectionMuted, | |||
| 505 | - | Name: styleSet.pickerName, | |||
| 506 | - | Detail: styleSet.paletteDesc, | |||
| 507 | - | Base: renderer.DefaultStyle(), | |||
| 508 | - | } | |||
| 509 | - | return composeModalClientFrame(base, pickerModal, styleSet, styleSet.selection, func(size domain.Size, _ ...renderer.Style) renderer.Frame { | |||
| 510 | - | return model.Render(size, preview, renderStyles) | |||
| 511 | - | }) | |||
| 512 | - | } | |||
| 513 | - | ||||
| 514 | func snapshotPickerPreview(tb *tab) picker.Preview { | 499 | func snapshotPickerPreview(tb *tab) picker.Preview { | ||
| 515 | if tb == nil { | 500 | if tb == nil { | ||
| 516 | return picker.Preview{} | 501 | return picker.Preview{} | ||
M internal/usecase/daemon/render_legacy_test.go +0 -8
| @@ -47,14 +47,6 @@ type composedFrameCache struct { | |||
| 47 | 47 | floatingCaptured capturedPaneRenderState | |
| 48 | 48 | } | |
| 49 | 49 | ||
| 50 | - | func (c *composedFrameCache) invalidate() { | |
| 51 | - | c.valid = false | |
| 52 | - | c.floating = nil | |
| 53 | - | c.floatingGeneration = 0 | |
| 54 | - | c.floatingGeometry = floatingGeometry{} | |
| 55 | - | c.floatingTitleGeneration = 0 | |
| 56 | - | } | |
| 57 | - | ||
| 58 | 50 | func composeClientFrame(sess *session, tb *tab, full bool, rightStatus string, caches ...*barCache) (renderer.Frame, []renderer.Damage) { | |
| 59 | 51 | return composeClientFrameWithState(barState{status: sess.statusSegments(true), copyFeedback: rightStatus}, tb, full, caches...) | |
| 60 | 52 | } | |
| @@ -47,14 +47,6 @@ type composedFrameCache struct { | |||||
| 47 | floatingCaptured capturedPaneRenderState | 47 | floatingCaptured capturedPaneRenderState | ||
| 48 | } | 48 | } | ||
| 49 | 49 | ||||
| 50 | - | func (c *composedFrameCache) invalidate() { | |||
| 51 | - | c.valid = false | |||
| 52 | - | c.floating = nil | |||
| 53 | - | c.floatingGeneration = 0 | |||
| 54 | - | c.floatingGeometry = floatingGeometry{} | |||
| 55 | - | c.floatingTitleGeneration = 0 | |||
| 56 | - | } | |||
| 57 | - | ||||
| 58 | func composeClientFrame(sess *session, tb *tab, full bool, rightStatus string, caches ...*barCache) (renderer.Frame, []renderer.Damage) { | 50 | func composeClientFrame(sess *session, tb *tab, full bool, rightStatus string, caches ...*barCache) (renderer.Frame, []renderer.Damage) { | ||
| 59 | return composeClientFrameWithState(barState{status: sess.statusSegments(true), copyFeedback: rightStatus}, tb, full, caches...) | 51 | return composeClientFrameWithState(barState{status: sess.statusSegments(true), copyFeedback: rightStatus}, tb, full, caches...) | ||
| 60 | } | 52 | } | ||