luzifer/streamdeck
1
0
Fork 0
mirror of https://github.com/Luzifer/streamdeck.git synced 2024-12-20 09:41:19 +00:00
Code Issues Releases Wiki Activity

Add background_color attribute to text display elements

Browse source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2022-08-14 15:56:07 +02:00
parent 71716320c5
commit 954a9e9cbc
Signed by: luzifer
GPG key ID: 0066F03ED215AD7D
3 changed files with 69 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
cmd/streamdeck/config.go
View file

@ -18,35 +18,40 @@ func init() {
} }
type attributeCollection struct { type attributeCollection struct {
AttachStderr bool `json:"attach_stderr,omitempty" yaml:"attach_stderr,omitempty"` AttachStderr bool `json:"attach_stderr,omitempty" yaml:"attach_stderr,omitempty"`
AttachStdout bool `json:"attach_stdout,omitempty" yaml:"attach_stdout,omitempty"` AttachStdout bool `json:"attach_stdout,omitempty" yaml:"attach_stdout,omitempty"`
Border *int `json:"border,omitempty" yaml:"border,omitempty"` BackgroundColor []int `json:"background_color,omitempty" yaml:"background_color,omitempty"`
Caption string `json:"caption,omitempty" yaml:"caption,omitempty"` Border *int `json:"border,omitempty" yaml:"border,omitempty"`
ChangeVolume *float64 `json:"change_volume,omitempty" yaml:"change_volume,omitempty"` Caption string `json:"caption,omitempty" yaml:"caption,omitempty"`
Color string `json:"color,omitempty" yaml:"color,omitempty"` ChangeVolume *float64 `json:"change_volume,omitempty" yaml:"change_volume,omitempty"`
Command []string `json:"command,omitempty" yaml:"command,omitempty"` Color string `json:"color,omitempty" yaml:"color,omitempty"`
Delay time.Duration `json:"delay,omitempty" yaml:"delay,omitempty"` Command []string `json:"command,omitempty" yaml:"command,omitempty"`
Device string `json:"device,omitempty" yaml:"device,omitempty"` Delay time.Duration `json:"delay,omitempty" yaml:"delay,omitempty"`
Env map[string]string `json:"env,omitempty" yaml:"env,omitempty"` Device string `json:"device,omitempty" yaml:"device,omitempty"`
FontSize *float64 `json:"font_size,omitempty" yaml:"font_size,omitempty"` Env map[string]string `json:"env,omitempty" yaml:"env,omitempty"`
Image string `json:"image,omitempty" yaml:"image,omitempty"` FontSize *float64 `json:"font_size,omitempty" yaml:"font_size,omitempty"`
Interval time.Duration `json:"interval,omitempty" yaml:"interval,omitempty"` Image string `json:"image,omitempty" yaml:"image,omitempty"`
KeyCodes []int `json:"key_codes,omitempty" yaml:"key_codes,omitempty"` Interval time.Duration `json:"interval,omitempty" yaml:"interval,omitempty"`
Keys []string `json:"keys,omitempty" yaml:"keys,omitempty"` KeyCodes []int `json:"key_codes,omitempty" yaml:"key_codes,omitempty"`
Match string `json:"match,omitempty" yaml:"match,omitempty"` Keys []string `json:"keys,omitempty" yaml:"keys,omitempty"`
ModAlt bool `json:"mod_alt,omitempty" yaml:"mod_alt,omitempty"` Match string `json:"match,omitempty" yaml:"match,omitempty"`
ModCtrl bool `json:"mod_ctrl,omitempty" yaml:"mod_ctrl,omitempty"` ModAlt bool `json:"mod_alt,omitempty" yaml:"mod_alt,omitempty"`
ModShift bool `json:"mod_shift,omitempty" yaml:"mod_shift,omitempty"` ModCtrl bool `json:"mod_ctrl,omitempty" yaml:"mod_ctrl,omitempty"`
ModMeta bool `json:"mod_meta,omitempty" yaml:"mod_meta,omitempty"` ModShift bool `json:"mod_shift,omitempty" yaml:"mod_shift,omitempty"`
Mute string `json:"mute,omitempty" yaml:"mute,omitempty"` ModMeta bool `json:"mod_meta,omitempty" yaml:"mod_meta,omitempty"`
Name string `json:"name,omitempty" yaml:"name,omitempty"` Mute string `json:"mute,omitempty" yaml:"mute,omitempty"`
Path string `json:"path,omitempty" yaml:"path,omitempty"` Name string `json:"name,omitempty" yaml:"name,omitempty"`
Relative int `json:"relative,omitempty" yaml:"relative,omitempty"` Path string `json:"path,omitempty" yaml:"path,omitempty"`
RGBA []int `json:"rgba,omitempty" yaml:"rgba,omitempty"` Relative int `json:"relative,omitempty" yaml:"relative,omitempty"`
SetVolume *float64 `json:"set_volume,omitempty" yaml:"set_volume,omitempty"` RGBA []int `json:"rgba,omitempty" yaml:"rgba,omitempty"`
Text string `json:"text,omitempty" yaml:"text,omitempty"` SetVolume *float64 `json:"set_volume,omitempty" yaml:"set_volume,omitempty"`
URL string `json:"url,omitempty" yaml:"url,omitempty"` Text string `json:"text,omitempty" yaml:"text,omitempty"`
Wait bool `json:"wait,omitempty" yaml:"wait,omitempty"` URL string `json:"url,omitempty" yaml:"url,omitempty"`
Wait bool `json:"wait,omitempty" yaml:"wait,omitempty"`
}
func (a attributeCollection) BackgroundToColor() color.RGBA {
return a.rgbaToColor(a.BackgroundColor)
} }
func (a attributeCollection) Clone() attributeCollection { func (a attributeCollection) Clone() attributeCollection {
@ -62,10 +67,14 @@ func (a attributeCollection) Clone() attributeCollection {
} }
func (a attributeCollection) RGBAToColor() color.RGBA { func (a attributeCollection) RGBAToColor() color.RGBA {
if len(a.RGBA) != 4 { return a.rgbaToColor(a.RGBA)
}
func (a attributeCollection) rgbaToColor(src []int) color.RGBA {
if len(src) != 4 {
return color.RGBA{} return color.RGBA{}
} }
return color.RGBA{uint8(a.RGBA[0]), uint8(a.RGBA[1]), uint8(a.RGBA[2]), uint8(a.RGBA[3])} return color.RGBA{uint8(src[0]), uint8(src[1]), uint8(src[2]), uint8(src[3])}
} }
type config struct { type config struct {

16
cmd/streamdeck/display_text.go
View file

@ -2,11 +2,12 @@ package main
import ( import (
"context" "context"
"github.com/pkg/errors"
"image/color" "image/color"
_ "image/jpeg" _ "image/jpeg"
_ "image/png" _ "image/png"
"strings" "strings"
"github.com/pkg/errors"
) )
func init() { func init() {
@ -24,6 +25,19 @@ func (d displayElementText) Display(ctx context.Context, idx int, attributes att
) )
// Initialize background // Initialize background
if attributes.BackgroundColor != nil {
if len(attributes.BackgroundColor) != 4 {
return errors.New("Background color definition needs 4 hex values")
}
if err := ctx.Err(); err != nil {
// Page context was cancelled, do not draw
return err
}
imgRenderer.DrawBackgroundColor(attributes.BackgroundToColor())
}
if attributes.Image != "" { if attributes.Image != "" {
if err = imgRenderer.DrawBackgroundFromFile(attributes.Image); err != nil { if err = imgRenderer.DrawBackgroundFromFile(attributes.Image); err != nil {
return errors.Wrap(err, "Unable to draw background from disk") return errors.Wrap(err, "Unable to draw background from disk")

16
cmd/streamdeck/helper_displayText.go
View file

@ -42,6 +42,18 @@ func (t *textOnImageRenderer) DrawBackground(bgi image.Image) {
draw.Draw(t.img, t.img.Bounds(), bgi, image.ZP, draw.Src) draw.Draw(t.img, t.img.Bounds(), bgi, image.ZP, draw.Src)
} }
func (t *textOnImageRenderer) DrawBackgroundColor(col color.RGBA) {
img := image.NewRGBA(image.Rect(0, 0, sd.IconSize(), sd.IconSize()))
for x := 0; x < sd.IconSize(); x++ {
for y := 0; y < sd.IconSize(); y++ {
img.Set(x, y, col)
}
}
t.DrawBackground(img)
}
func (t *textOnImageRenderer) DrawBackgroundFromFile(filename string) error { func (t *textOnImageRenderer) DrawBackgroundFromFile(filename string) error {
bgi, err := t.getImageFromDisk(filename) bgi, err := t.getImageFromDisk(filename)
if err != nil { if err != nil {
@ -70,7 +82,7 @@ func (t *textOnImageRenderer) DrawBigText(text string, fontSizeHint float64, bor
} }
func (t *textOnImageRenderer) DrawCaptionText(text string) error { func (t *textOnImageRenderer) DrawCaptionText(text string) error {
var fontFile = userConfig.CaptionFont fontFile := userConfig.CaptionFont
if fontFile == "" { if fontFile == "" {
fontFile = userConfig.RenderFont fontFile = userConfig.RenderFont
} }
@ -91,7 +103,7 @@ func (t *textOnImageRenderer) DrawCaptionText(text string) error {
} }
} }
var anchor = textDrawAnchorBottom anchor := textDrawAnchorBottom
if userConfig.CaptionPosition == "top" { if userConfig.CaptionPosition == "top" {
anchor = textDrawAnchorTop anchor = textDrawAnchorTop
} }