en2zmax/streamdeck-lets-go
1
0
Fork 0
Code Issues 1 Activity

fix: imageCache key includes targetSize/faScale; Alpine color input error breaks x-if rendering

Browse Source
This commit is contained in:
Maksim Totmin 2026-06-17 13:22:05 +07:00
parent ae693f7bf7
commit 44ad064488
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
page.go
View File

@ -415,7 +415,7 @@ func (pm *PageManager) renderKeyOutput(idx int, d *config.DisplayCfg, output str
} }
if do.Text == "" && bgOverride == nil { if do.Text == "" && bgOverride == nil {
return do = &DisplayOutput{}
} }
pm.displayMu.Lock() pm.displayMu.Lock()
@ -786,8 +786,13 @@ func parseEmojiRef(path string) (rune, error) {
return r, nil return r, nil
} }
func cacheKey(path string, targetSize int, faScale float64) string {
return fmt.Sprintf("%s|%d|%.6f", path, targetSize, faScale)
}
func loadImage(path string, targetSize int, faScale float64) (image.Image, error) { func loadImage(path string, targetSize int, faScale float64) (image.Image, error) {
if cached, ok := imageCache.Load(path); ok { key := cacheKey(path, targetSize, faScale)
if cached, ok := imageCache.Load(key); ok {
return cached.(image.Image), nil return cached.(image.Image), nil
} }
@ -800,7 +805,7 @@ func loadImage(path string, targetSize int, faScale float64) (image.Image, error
if err != nil { if err != nil {
return nil, err return nil, err
} }
imageCache.Store(path, img) imageCache.Store(key, img)
return img, nil return img, nil
} }
@ -810,7 +815,7 @@ func loadImage(path string, targetSize int, faScale float64) (image.Image, error
return nil, err return nil, err
} }
img := renderEmojiGlyph(r, targetSize, faScale) img := renderEmojiGlyph(r, targetSize, faScale)
imageCache.Store(path, img) imageCache.Store(key, img)
return img, nil return img, nil
} }
@ -830,7 +835,7 @@ func loadImage(path string, targetSize int, faScale float64) (image.Image, error
if err != nil { if err != nil {
return nil, err return nil, err
} }
imageCache.Store(path, img) imageCache.Store(key, img)
return img, nil return img, nil
} }
@ -845,7 +850,7 @@ func loadImage(path string, targetSize int, faScale float64) (image.Image, error
return nil, fmt.Errorf("decode: %w", err) return nil, fmt.Errorf("decode: %w", err)
} }
imageCache.Store(path, img) imageCache.Store(key, img)
return img, nil return img, nil
} }

3
static/index.html
View File

@ -505,7 +505,8 @@
<div class="form-group"> <div class="form-group">
<label>Background</label> <label>Background</label>
<div style="display:flex;gap:8px;align-items:center;"> <div style="display:flex;gap:8px;align-items:center;">
<input type="color" x-model="editForm.bg_color" <input type="color" :value="editForm.bg_color || '#000000'"
@input="editForm.bg_color = $event.target.value"
style="width:40px;height:40px;padding:2px;border-radius:var(--radius-xs);cursor:pointer;"> style="width:40px;height:40px;padding:2px;border-radius:var(--radius-xs);cursor:pointer;">
<input type="text" x-model="editForm.bg_color" <input type="text" x-model="editForm.bg_color"
placeholder="#rrggbb or #rrggbbaa" maxlength="9" placeholder="#rrggbb or #rrggbbaa" maxlength="9"