From: Kevin Kuehler <keur@xcf.berkeley.edu>
To: ~sircmpwn/aerc@lists.sr.ht
Cc: Kevin Kuehler <keur@xcf.berkeley.edu>
Subject: [PATCH v2 3/9] [WIP] widgets/msglist: Draw each row in a function
Date: Mon, 28 Oct 2019 12:07:02 -0700
Message-Id: <20191028190708.253770-3-keur@xcf.berkeley.edu>
In-Reply-To: <20191028190708.253770-1-keur@xcf.berkeley.edu>
References: <20191028190708.253770-1-keur@xcf.berkeley.edu>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

This function can be reused by the threading code.

Signed-off-by: Kevin Kuehler <keur@xcf.berkeley.edu>
---
 widgets/msglist.go | 98 +++++++++++++++++++++++++---------------------
 1 file changed, 54 insertions(+), 44 deletions(-)

diff --git a/widgets/msglist.go b/widgets/msglist.go
index 5c2d2f4..ac3d6cc 100644
--- a/widgets/msglist.go
+++ b/widgets/msglist.go
@@ -71,52 +71,9 @@ func (ml *MessageList) Draw(ctx *ui.Context) {
=20
 	for i :=3D len(uids) - 1 - ml.scroll; i >=3D 0; i-- {
 		uid :=3D uids[i]
-		msg :=3D store.Messages[uid]
-
-		if row >=3D ctx.Height() {
+		if ml.drawRow(ctx, uid, i, row, &needsHeaders) {
 			break
 		}
-
-		if msg =3D=3D nil {
-			needsHeaders =3D append(needsHeaders, uid)
-			ml.spinner.Draw(ctx.Subcontext(0, row, ctx.Width(), 1))
-			row +=3D 1
-			continue
-		}
-
-		style :=3D tcell.StyleDefault
-
-		// current row
-		if row =3D=3D ml.store.SelectedIndex()-ml.scroll {
-			style =3D style.Reverse(true)
-		}
-		// deleted message
-		if _, ok :=3D store.Deleted[msg.Uid]; ok {
-			style =3D style.Foreground(tcell.ColorGray)
-		}
-		// unread message
-		seen :=3D false
-		for _, flag :=3D range msg.Flags {
-			if flag =3D=3D models.SeenFlag {
-				seen =3D true
-			}
-		}
-		if !seen {
-			style =3D style.Bold(true)
-		}
-
-		ctx.Fill(0, row, ctx.Width(), 1, ' ', style)
-		fmtStr, args, err :=3D format.ParseMessageFormat(
-			ml.conf.Ui.IndexFormat,
-			ml.conf.Ui.TimestampFormat, "", i, msg)
-		if err !=3D nil {
-			ctx.Printf(0, row, style, "%v", err)
-		} else {
-			line :=3D fmt.Sprintf(fmtStr, args...)
-			line =3D runewidth.Truncate(line, ctx.Width(), "=E2=80=A6")
-			ctx.Printf(0, row, style, "%s", line)
-		}
-
 		row +=3D 1
 	}
=20
@@ -132,6 +89,59 @@ func (ml *MessageList) Draw(ctx *ui.Context) {
 	}
 }
=20
+// Draw one message.
+//
+// Return: If true, don't fetch any more messages
+func (ml *MessageList) drawRow(ctx *ui.Context, uid uint32, number int, =
row int, needsHeaders *[]uint32) bool {
+	store :=3D ml.store
+	msg :=3D store.Messages[uid]
+
+	if row >=3D ctx.Height() {
+		return true
+	}
+
+	if msg =3D=3D nil {
+		*needsHeaders =3D append(*needsHeaders, uid)
+		ml.spinner.Draw(ctx.Subcontext(0, row, ctx.Width(), 1))
+		return false
+	}
+
+	style :=3D tcell.StyleDefault
+
+	// current row
+	if row =3D=3D ml.store.SelectedIndex()-ml.scroll {
+		style =3D style.Reverse(true)
+	}
+	// deleted message
+	if _, ok :=3D store.Deleted[msg.Uid]; ok {
+		style =3D style.Foreground(tcell.ColorGray)
+	}
+	// unread message
+	seen :=3D false
+	for _, flag :=3D range msg.Flags {
+		if flag =3D=3D models.SeenFlag {
+			seen =3D true
+		}
+	}
+	if !seen {
+		style =3D style.Bold(true)
+	}
+
+	ctx.Fill(0, row, ctx.Width(), 1, ' ', style)
+	fmtStr, args, err :=3D format.ParseMessageFormat(
+		ml.conf.Ui.IndexFormat,
+		ml.conf.Ui.TimestampFormat, "", number, msg)
+	if err !=3D nil {
+		ctx.Printf(0, row, style, "%v", err)
+	} else {
+		line :=3D fmt.Sprintf(fmtStr, args...)
+		line =3D runewidth.Truncate(line, ctx.Width(), "=E2=80=A6")
+		ctx.Printf(0, row, style, "%s", line)
+	}
+
+	return false
+}
+
 func (ml *MessageList) MouseEvent(localX int, localY int, event tcell.Ev=
ent) {
 	switch event :=3D event.(type) {
 	case *tcell.EventMouse:
--=20
2.23.0