Update action badge font spacing

Author: bytedream

build/generate-font-width.go

@@ -0,0 +1,123 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+//go:build ignore
+
+package main
+
+import (
+	"archive/zip"
+	"bytes"
+	"flag"
+	"fmt"
+	"go/format"
+	"io"
+	"log"
+	"net/http"
+	"os"
+	"strings"
+	"unicode"
+
+	"golang.org/x/image/font"
+	"golang.org/x/image/font/sfnt"
+)
+
+const dejavuZip = "https://github.com/dejavu-fonts/dejavu-fonts/releases/download/version_2_37/dejavu-sans-ttf-2.37.zip"
+
+var flagOut = flag.String("o", "modules/badge/badge_font_width.go", "out")
+
+func main() {
+	flag.Parse()
+
+	ttfFont := extractFont()
+
+	str := "map[rune]int32{\n"
+	for r := rune(0); r <= unicode.MaxRune; r++ {
+		if !unicode.IsPrint(r) {
+			continue
+		}
+
+		glyphIndex, err := ttfFont.GlyphIndex(nil, r)
+		if err != nil {
+			log.Fatalf("Failed to find glyph for rune %s: %v", string(r), err)
+		} else if glyphIndex == 0 {
+			continue
+		}
+
+		advancedWidth, err := ttfFont.GlyphAdvance(nil, glyphIndex, 11, font.HintingNone)
+		if err != nil {
+			log.Fatalf("Failed to find font width for rune %s: %v", string(r), err)
+		} else if advancedWidth == 0 {
+			continue
+		}
+
+		str += fmt.Sprintf("\t%d: %d,\n", r, advancedWidth)
+	}
+	str += "}"
+
+	data, err := format.Source([]byte(str))
+	if err != nil {
+		log.Fatalf("Failed to format generated code: %v", err)
+	}
+
+	err = os.WriteFile(*flagOut, []byte(fmt.Sprintf(hdr, dejavuZip, data)), 0o644)
+	if err != nil {
+		log.Fatalf("Failed to write file: %v", err)
+	}
+}
+
+func extractFont() *sfnt.Font {
+	resp, err := http.Get(dejavuZip)
+	if err != nil {
+		log.Fatalf("Failed to download archive: %v", err)
+	}
+	defer resp.Body.Close()
+
+	buf, err := io.ReadAll(resp.Body)
+	if err != nil {
+		log.Fatalf("Failed to read download archive: %v", err)
+	}
+
+	bufReader := io.NewSectionReader(bytes.NewReader(buf), 0, int64(len(buf)))
+
+	archive, err := zip.NewReader(bufReader, int64(len(buf)))
+	if err != nil {
+		log.Fatalf("Failed to unzip archive: %v", err)
+	}
+
+	var fontBytes []byte
+	for _, file := range archive.File {
+		if strings.HasSuffix(file.Name, ".ttf") {
+			ttfFile, err := file.Open()
+			if err != nil {
+				log.Fatalf("Failed to extract font from archive: %v", err)
+			}
+
+			if fontBytes, err = io.ReadAll(ttfFile); err != nil {
+				log.Fatalf("Failed to extract font from archive: %v", err)
+			}
+
+			break
+		}
+	}
+	if fontBytes == nil {
+		log.Fatalf("Failed to find font in archive")
+	}
+
+	font, err := sfnt.Parse(fontBytes)
+	if err != nil {
+		log.Fatalf("Failed to parse font: %v", err)
+	}
+
+	return font
+}
+
+const hdr = `// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package badge
+
+// Code generated by build/generate-font-width.go. DO NOT EDIT.
+// Sourced from %s
+var DejaVuFontWidthData = %s
+`

modules/badge/badge.go

@@ -11,65 +11,43 @@ import (
 // We use 10x scale to calculate more precisely
 // Then scale down to normal size in tmpl file
 
-type Label struct {
-	text  string
-	width int
-}
-
-func (l Label) Text() string {
-	return l.text
-}
-
-func (l Label) Width() int {
-	return l.width
-}
-
-func (l Label) TextLength() int {
-	return int(float64(l.width-defaultOffset) * 9.5)
-}
-
-func (l Label) X() int {
-	return l.width*5 + 10
-}
-
-type Message struct {
+type Text struct {
 	text  string
 	width int
 	x     int
 }
 
-func (m Message) Text() string {
-	return m.text
+func (t Text) Text() string {
+	return t.text
 }
 
-func (m Message) Width() int {
-	return m.width
+func (t Text) Width() int {
+	return t.width
 }
 
-func (m Message) X() int {
-	return m.x
+func (t Text) X() int {
+	return t.x
 }
 
-func (m Message) TextLength() int {
-	return int(float64(m.width-defaultOffset) * 9.5)
+func (t Text) TextLength() int {
+	return int(float64(t.width-defaultOffset) * 10)
 }
 
 type Badge struct {
 	Color    string
 	FontSize int
-	Label    Label
-	Message  Message
+	Label    Text
+	Message  Text
 }
 
 func (b Badge) Width() int {
 	return b.Label.width + b.Message.width
 }
 
 const (
-	defaultOffset    = 9
-	defaultFontSize  = 11
-	DefaultColor     = "#9f9f9f" // Grey
-	defaultFontWidth = 7         // approximate speculation
+	defaultOffset   = 10
+	defaultFontSize = 11
+	DefaultColor    = "#9f9f9f" // Grey
 )
 
 var StatusColorMap = map[actions_model.Status]string{
@@ -85,20 +63,37 @@ var StatusColorMap = map[actions_model.Status]string{
 
 // GenerateBadge generates badge with given template
 func GenerateBadge(label, message, color string) Badge {
-	lw := defaultFontWidth*len(label) + defaultOffset
-	mw := defaultFontWidth*len(message) + defaultOffset
-	x := lw*10 + mw*5 - 10
+	lw := calculateTextWidth(label) + defaultOffset
+	mw := calculateTextWidth(message) + defaultOffset
+
+	lx := lw * 5
+	mx := lw*10 + mw*5 - 10
 	return Badge{
-		Label: Label{
+		Label: Text{
 			text:  label,
 			width: lw,
+			x:     lx,
 		},
-		Message: Message{
+		Message: Text{
 			text:  message,
 			width: mw,
-			x:     x,
+			x:     mx,
 		},
 		FontSize: defaultFontSize * 10,
 		Color:    color,
 	}
 }
+
+func calculateTextWidth(text string) int {
+	width := 0
+
+	for _, char := range text {
+		charWidth, ok := DejaVuFontWidthData[char]
+		if !ok {
+			charWidth = 0
+		}
+		width += int(charWidth)
+	}
+
+	return width
+}