luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactored fn calls & names

Browse source
This commit is contained in:
melsonic 2025-04-11 01:43:47 +05:30
parent 8f64c02dd8
commit cc6d722e2e
No known key found for this signature in database
GPG key ID: DFA426742F621CD7
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
d2themes/sketch_overlay.go
View file

@ -24,18 +24,11 @@ func (o *ThemableSketchOverlay) Render() (string, error) {
if color.IsThemeColor(o.fill) { if color.IsThemeColor(o.fill) {
o.el.ClassName += fmt.Sprintf(" sketch-overlay-%s", o.fill) // e.g. sketch-overlay-B3 o.el.ClassName += fmt.Sprintf(" sketch-overlay-%s", o.fill) // e.g. sketch-overlay-B3
} else { } else {
var lc string lc, err := color.LuminanceCategory(o.fill)
if color.IsUrlGradientId(o.fill) { if err != nil {
lc = "normal" return "", err
} else {
var err error
lc, err = color.LuminanceCategory(o.fill)
if err != nil {
return "", err
}
} }
o.el.ClassName += fmt.Sprintf(" sketch-overlay-%s", lc) // e.g. sketch-overlay-dark o.el.ClassName += fmt.Sprintf(" sketch-overlay-%s", lc) // e.g. sketch-overlay-dark
} }
return o.el.Render(), nil return o.el.Render(), nil
} }

3
lib/color/color.go
View file

@ -86,6 +86,9 @@ func darkenCSS(colorString string) (string, error) {
} }
func LuminanceCategory(colorString string) (string, error) { func LuminanceCategory(colorString string) (string, error) {
if IsURLGradientID(colorString) {
return "normal", nil
}
l, err := Luminance(colorString) l, err := Luminance(colorString)
if err != nil { if err != nil {
return "", err return "", err

6
lib/color/gradient.go
View file

@ -247,8 +247,8 @@ func IsGradient(color string) bool {
return GradientRegex.MatchString(color) return GradientRegex.MatchString(color)
} }
var UrlGradientId = regexp.MustCompile(`^url\('#grad-[a-f0-9]{40}'\)$`) var URLGradientID = regexp.MustCompile(`^url\('#grad-[a-f0-9]{40}'\)$`)
func IsUrlGradientId(color string) bool { func IsURLGradientID(color string) bool {
return UrlGradientId.MatchString(color) return URLGradientID.MatchString(color)
} }