xiaoqidun/ofdgo
1
0
Fork 0
mirror of https://github.com/xiaoqidun/ofdgo.git synced 2026-08-30 12:12:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(字体渲染): 优化字体渲染判断

Browse Source
This commit is contained in:
xiaoqidun
2026-01-02 12:54:17 +08:00
parent 3245fe4122
commit 137e5d4b36
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ofdgo_renderer.go
+13 -6
View File
@@ -474,7 +474,7 @@ func (r *Renderer) renderText(ctx *canvas.Context, obj TextObject, pageH float64
textColor = parseColor(obj.FillColor.Value) textColor = parseColor(obj.FillColor.Value)
} }
fontStyle := canvas.FontRegular fontStyle := canvas.FontRegular
if obj.Weight >= 700 || (obj.Weight == 0 && (strings.Contains(strings.ToLower(obj.Font), "bold"))) { if obj.Weight >= 700 {
fontStyle |= canvas.FontBold fontStyle |= canvas.FontBold
} }
if obj.Italic { if obj.Italic {
@@ -555,12 +555,19 @@ func (r *Renderer) loadFont(fontID string) *canvas.FontFamily {
} }
} }
} }
var fontStyle canvas.FontStyle
if of.Bold {
fontStyle |= canvas.FontBold
}
if of.Italic {
fontStyle |= canvas.FontItalic
}
for _, dir := range r.fontDirs { for _, dir := range r.fontDirs {
matches, _ := filepath.Glob(filepath.Join(dir, of.FontName+"*")) matches, _ := filepath.Glob(filepath.Join(dir, of.FontName+"*"))
for _, m := range matches { for _, m := range matches {
ext := strings.ToLower(filepath.Ext(m)) ext := strings.ToLower(filepath.Ext(m))
if ext == ".ttf" || ext == ".otf" || ext == ".ttc" { if ext == ".ttf" || ext == ".otf" || ext == ".ttc" {
if err := ff.LoadFontFile(m, canvas.FontRegular); err == nil { if err := ff.LoadFontFile(m, fontStyle); err == nil {
r.FontMap[fontID] = ff r.FontMap[fontID] = ff
return ff return ff
} }
@@ -572,7 +579,7 @@ func (r *Renderer) loadFont(fontID string) *canvas.FontFamily {
for _, m := range matches { for _, m := range matches {
resData, err := fs.ReadFile(fsys, m) resData, err := fs.ReadFile(fsys, m)
if err == nil { if err == nil {
if err := ff.LoadFont(resData, 0, canvas.FontRegular); err == nil { if err := ff.LoadFont(resData, 0, fontStyle); err == nil {
r.FontMap[fontID] = ff r.FontMap[fontID] = ff
return ff return ff
} }
@@ -612,12 +619,12 @@ func (r *Renderer) loadFont(fontID string) *canvas.FontFamily {
} }
} }
} }
if err := ff.LoadSystemFont(targetName, canvas.FontRegular); err == nil { if err := ff.LoadSystemFont(targetName, fontStyle); err == nil {
r.FontMap[fontID] = ff r.FontMap[fontID] = ff
return ff return ff
} }
if targetName != name { if targetName != name {
if err := ff.LoadSystemFont(name, canvas.FontRegular); err == nil { if err := ff.LoadSystemFont(name, fontStyle); err == nil {
r.FontMap[fontID] = ff r.FontMap[fontID] = ff
return ff return ff
} }
@@ -636,7 +643,7 @@ func (r *Renderer) loadFont(fontID string) *canvas.FontFamily {
} }
} }
for _, m := range matches { for _, m := range matches {
if err := ff.LoadFontFile(m, canvas.FontRegular); err == nil { if err := ff.LoadFontFile(m, fontStyle); err == nil {
r.FontMap[fontID] = ff r.FontMap[fontID] = ff
return ff return ff
} }