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-07-01 21:01:22 +08:00
parent fe99089299
commit d3bd0ea947
1 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ofdgo_text.go
+28 -16
View File
@@ -148,13 +148,16 @@ func parseFillColor(fillColor *FillColor) color.Color {
if fillColor.Pattern != nil { if fillColor.Pattern != nil {
return nil return nil
} }
if strings.TrimSpace(fillColor.Value) != "" {
return parseColorWithAlpha(fillColor.Value, fillColor.Alpha)
}
if fillColor.AxialShd != nil { if fillColor.AxialShd != nil {
return parseAxialShdColor(fillColor.AxialShd, fillColor.Alpha) return parseAxialShdColor(fillColor.AxialShd, fillColor.Alpha)
} }
return parseRadialShdColor(fillColor.RadialShd, fillColor.Alpha) if fillColor.RadialShd != nil {
return parseRadialShdColor(fillColor.RadialShd, fillColor.Alpha)
}
if strings.TrimSpace(fillColor.Value) != "" {
return parseColorWithAlpha(fillColor.Value, fillColor.Alpha)
}
return nil
} }
// parseFillPaint 解析填充画刷 // parseFillPaint 解析填充画刷
@@ -167,9 +170,6 @@ func parseFillPaint(fillColor *FillColor, x, y, pageH, originX, originY float64)
if fillColor.Pattern != nil { if fillColor.Pattern != nil {
return nil return nil
} }
if strings.TrimSpace(fillColor.Value) != "" {
return parseColorWithAlpha(fillColor.Value, fillColor.Alpha)
}
if gradient := parseAxialShdGradient(fillColor.AxialShd, fillColor.Alpha, x, y, pageH, originX, originY); gradient != nil { if gradient := parseAxialShdGradient(fillColor.AxialShd, fillColor.Alpha, x, y, pageH, originX, originY); gradient != nil {
return gradient return gradient
} }
@@ -179,7 +179,13 @@ func parseFillPaint(fillColor *FillColor, x, y, pageH, originX, originY float64)
if fillColor.AxialShd != nil { if fillColor.AxialShd != nil {
return parseAxialShdColor(fillColor.AxialShd, fillColor.Alpha) return parseAxialShdColor(fillColor.AxialShd, fillColor.Alpha)
} }
return parseRadialShdColor(fillColor.RadialShd, fillColor.Alpha) if fillColor.RadialShd != nil {
return parseRadialShdColor(fillColor.RadialShd, fillColor.Alpha)
}
if strings.TrimSpace(fillColor.Value) != "" {
return parseColorWithAlpha(fillColor.Value, fillColor.Alpha)
}
return nil
} }
// parseStrokeColor 解析勾边颜色 // parseStrokeColor 解析勾边颜色
@@ -189,13 +195,16 @@ func parseStrokeColor(strokeColor *StrokeColor) color.Color {
if strokeColor == nil { if strokeColor == nil {
return nil return nil
} }
if strings.TrimSpace(strokeColor.Value) != "" {
return parseColorWithAlpha(strokeColor.Value, strokeColor.Alpha)
}
if strokeColor.AxialShd != nil { if strokeColor.AxialShd != nil {
return parseAxialShdColor(strokeColor.AxialShd, strokeColor.Alpha) return parseAxialShdColor(strokeColor.AxialShd, strokeColor.Alpha)
} }
return parseRadialShdColor(strokeColor.RadialShd, strokeColor.Alpha) if strokeColor.RadialShd != nil {
return parseRadialShdColor(strokeColor.RadialShd, strokeColor.Alpha)
}
if strings.TrimSpace(strokeColor.Value) != "" {
return parseColorWithAlpha(strokeColor.Value, strokeColor.Alpha)
}
return nil
} }
// parseStrokePaint 解析勾边画刷 // parseStrokePaint 解析勾边画刷
@@ -205,9 +214,6 @@ func parseStrokePaint(strokeColor *StrokeColor, x, y, pageH, originX, originY fl
if strokeColor == nil { if strokeColor == nil {
return nil return nil
} }
if strings.TrimSpace(strokeColor.Value) != "" {
return parseColorWithAlpha(strokeColor.Value, strokeColor.Alpha)
}
if gradient := parseAxialShdGradient(strokeColor.AxialShd, strokeColor.Alpha, x, y, pageH, originX, originY); gradient != nil { if gradient := parseAxialShdGradient(strokeColor.AxialShd, strokeColor.Alpha, x, y, pageH, originX, originY); gradient != nil {
return gradient return gradient
} }
@@ -217,7 +223,13 @@ func parseStrokePaint(strokeColor *StrokeColor, x, y, pageH, originX, originY fl
if strokeColor.AxialShd != nil { if strokeColor.AxialShd != nil {
return parseAxialShdColor(strokeColor.AxialShd, strokeColor.Alpha) return parseAxialShdColor(strokeColor.AxialShd, strokeColor.Alpha)
} }
return parseRadialShdColor(strokeColor.RadialShd, strokeColor.Alpha) if strokeColor.RadialShd != nil {
return parseRadialShdColor(strokeColor.RadialShd, strokeColor.Alpha)
}
if strings.TrimSpace(strokeColor.Value) != "" {
return parseColorWithAlpha(strokeColor.Value, strokeColor.Alpha)
}
return nil
} }
// parseAxialShdColor 解析轴向渐变颜色 // parseAxialShdColor 解析轴向渐变颜色