test fonts

Author: wxiaoguang

modules/badge/badge.go

@@ -36,21 +36,23 @@ func (t Text) TextLength() int {
 }
 
 type Badge struct {
-	IDPrefix string
-	Color    string
-	FontSize int
-	Label    Text
-	Message  Text
+	IDPrefix   string
+	FontFamily string
+	Color      string
+	FontSize   int
+	Label      Text
+	Message    Text
 }
 
 func (b Badge) Width() int {
 	return b.Label.width + b.Message.width
 }
 
 const (
-	defaultOffset   = 10
-	defaultFontSize = 11
-	DefaultColor    = "#9f9f9f" // Grey
+	defaultOffset     = 10
+	defaultFontSize   = 11
+	DefaultColor      = "#9f9f9f" // Grey
+	DefaultFontFamily = "DejaVu Sans,Verdana,Geneva,sans-serif"
 )
 
 var StatusColorMap = map[actions_model.Status]string{
@@ -72,6 +74,7 @@ func GenerateBadge(label, message, color string) Badge {
 	lx := lw * 5
 	mx := lw*10 + mw*5 - 10
 	return Badge{
+		FontFamily: DefaultFontFamily,
 		Label: Text{
 			text:  label,
 			width: lw,

routers/web/devtest/devtest.go

@@ -18,6 +18,7 @@ import (
 	"code.gitea.io/gitea/modules/badge"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/templates"
+	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/services/context"
 )
 
@@ -125,24 +126,31 @@ func prepareMockDataBadgeCommitSign(ctx *context.Context) {
 }
 
 func prepareMockDataBadgeActionsSvg(ctx *context.Context) {
+	fontFamilyNames := strings.Split(badge.DefaultFontFamily, ",")
+	selectedFontFamilyName := ctx.FormString("font", fontFamilyNames[0])
 	var badges []badge.Badge
+	badges = append(badges, badge.GenerateBadge("啊啊啊啊啊啊啊啊啊啊啊啊", "🌞🌞🌞🌞🌞", "green"))
 	for r := rune(0); r < 256; r++ {
 		if unicode.IsPrint(r) {
 			s := strings.Repeat(string(r), 15)
-			badges = append(badges, badge.GenerateBadge(s, s, "green"))
+			badges = append(badges, badge.GenerateBadge(s, util.TruncateRunes(s, 7), "green"))
 		}
 	}
-	var mockSVGs []template.HTML
+
+	var badgeSVGs []template.HTML
 	for i, b := range badges {
 		b.IDPrefix = "devtest-" + strconv.FormatInt(int64(i), 10) + "-"
+		b.FontFamily = selectedFontFamilyName
 		h, err := ctx.RenderToHTML("shared/actions/runner_badge", map[string]any{"Badge": b})
 		if err != nil {
 			ctx.ServerError("RenderToHTML", err)
 			return
 		}
-		mockSVGs = append(mockSVGs, h)
+		badgeSVGs = append(badgeSVGs, h)
 	}
-	ctx.Data["MockSVGs"] = mockSVGs
+	ctx.Data["BadgeSVGs"] = badgeSVGs
+	ctx.Data["BadgeFontFamilyNames"] = fontFamilyNames
+	ctx.Data["SelectedFontFamilyName"] = selectedFontFamilyName
 }
 
 func prepareMockData(ctx *context.Context) {

templates/devtest/badge-actions-svg.tmpl

@@ -2,9 +2,17 @@
 <div class="page-content devtest ui container">
 	<div>
 		<h1>Actions SVG</h1>
-		{{range $badgeSVG := .MockSVGs}}
-			<div class="tw-my-2">{{$badgeSVG}}</div>
+		<form class="tw-my-3">
+			{{range $fontName := .BadgeFontFamilyNames}}
+				<label><input name="font" type="radio" value="{{$fontName}}" {{Iif (eq $.SelectedFontFamilyName $fontName) "checked"}}>{{$fontName}}</label>
+			{{end}}
+			<button>submit</button>
+		</form>
+		<div class="flex-text-block tw-flex-wrap">
+		{{range $badgeSVG := .BadgeSVGs}}
+			<div>{{$badgeSVG}}</div>
 		{{end}}
+		</div>
 	</div>
 </div>
 {{template "devtest/devtest-footer"}}

templates/shared/actions/runner_badge.tmpl

@@ -13,7 +13,7 @@
 		<rect x="{{.Badge.Label.Width}}" width="{{.Badge.Message.Width}}" height="20" fill="{{.Badge.Color}}" />
 		<rect width="{{.Badge.Width}}" height="20" fill="url(#{{.Badge.IDPrefix}}s)" />
 	</g>
-	<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif"
+	<g fill="#fff" text-anchor="middle" font-family="{{.Badge.FontFamily}}"
 		text-rendering="geometricPrecision" font-size="{{.Badge.FontSize}}">
 		<text aria-hidden="true" x="{{.Badge.Label.X}}" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)"
 			textLength="{{.Badge.Label.TextLength}}">{{.Badge.Label.Text}}</text>