refactor(reader): Move drawfunc-setting functions to newFeedsPane

bow · Dec 26, 2023 · bb7b676 · bb7b676
1 parent d6db0e5
commit bb7b676
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/internal/reader/feeds_pane.go b/internal/reader/feeds_pane.go
@@ -20,12 +20,16 @@ func newFeedsPane(theme *Theme) *feedsPane {
 
 	fp := feedsPane{theme: theme}
 	fp.setupNavTree()
-	fp.setupDrawFunc()
+
+	focusf, unfocusf := fp.makeDrawFuncs()
+	fp.SetDrawFunc(unfocusf)
+	fp.SetFocusFunc(func() { fp.SetDrawFunc(focusf) })
+	fp.SetBlurFunc(func() { fp.SetDrawFunc(unfocusf) })
 
 	return &fp
 }
 
-func (fp *feedsPane) setupDrawFunc() {
+func (fp *feedsPane) makeDrawFuncs() (focusf, unfocusf drawFunc) {
 
 	var titleUF, titleF string
 	if fp.theme.FeedsPaneTitle != "" {
@@ -73,12 +77,10 @@ func (fp *feedsPane) setupDrawFunc() {
 		}
 	}
 
-	focusf := drawf(true)
-	ufocusf := drawf(false)
+	focusf = drawf(true)
+	unfocusf = drawf(false)
 
-	fp.SetDrawFunc(ufocusf)
-	fp.SetFocusFunc(func() { fp.SetDrawFunc(focusf) })
-	fp.SetBlurFunc(func() { fp.SetDrawFunc(ufocusf) })
+	return focusf, unfocusf
 }
 
 func (fp *feedsPane) setupNavTree() {

diff --git a/internal/reader/reader.go b/internal/reader/reader.go
@@ -61,6 +61,8 @@ type Reader struct {
 	focusStack tview.Primitive
 }
 
+type drawFunc func(screen tcell.Screen, x int, y int, w int, h int) (ix int, iy int, iw int, ih int)
+
 type Builder struct {
 	ctx      context.Context
 	addr     string