diff --git a/color.go b/color.go index 28e0287..6e72fb4 100644 --- a/color.go +++ b/color.go @@ -27,6 +27,7 @@ type ( Red byte Green byte Blue byte + TextColor walk.Color } Serie struct { @@ -42,6 +43,16 @@ type ( } ) +func (bc *BeadColor) SetColor(r byte, g byte, b byte) { + bc.Red = r + bc.Green = g + bc.Blue = b +} + +func (bc *BeadColor) SetTextColor() { + bc.TextColor = walk.RGB(255-bc.Red, 255-bc.Green, 255-bc.Blue) +} + func ShowBeads(mw *MyMainWindow, serie string) { for _, bead := range mw.beads { bead.Color.SetVisible(false) @@ -74,13 +85,6 @@ func CreateBeadsGroup(mw *MyMainWindow) { gb, _ := walk.NewGroupBox(mw.leftPanel) gb.SetTitle("Beads") gb.SetLayout(walk.NewVBoxLayout()) - btn, _ := walk.NewPushButton(gb) - btn.SetText("Select all colors") - btn.Clicked().Attach(func() { - for _, bead := range mw.beads { - bead.Checkbox.SetChecked(true) - } - }) mw.colors, _ = walk.NewScrollView(gb) mw.colors.SetLayout(walk.NewVBoxLayout()) LoadBeads(mw) @@ -123,14 +127,11 @@ func NewBeadColor(mw *MyMainWindow, name string, id int, red byte, green byte, b color := new(BeadColor) color.Color = cm color.SetBackgroundColor(walk.RGB(red, green, blue)) - color.Checkbox, err = walk.NewCheckBox(cm) - if err != nil { - log.Panic(err) - } - err = color.Checkbox.SetText(name) - if err != nil { - log.Panic(err) - } + color.SetColor(red, green, blue) + color.SetTextColor() + lbl, _ := walk.NewLabel(cm) + lbl.SetTextColor(color.TextColor) + lbl.SetText(name) walk.NewHSpacer(cm) color.add, err = walk.NewImageView(cm) if err != nil { @@ -233,7 +234,9 @@ func NewBeadColor(mw *MyMainWindow, name string, id int, red byte, green byte, b color.ErrorTooltip.AddTool(color.error) color.error.SetVisible(false) - lbl, _ := walk.NewLabel(cm) + //Setup color label + lbl, _ = walk.NewLabel(cm) + lbl.SetTextColor(color.TextColor) lbl.SetText(fmt.Sprint("Color ID: ", id)) cm.SetBackground(color.backgroundColor) diff --git a/main.go b/main.go index db6f04a..cde43b1 100644 --- a/main.go +++ b/main.go @@ -32,7 +32,7 @@ type MyMainWindow struct { const ( AppName string = "BeadImager" - Version string = "0.4.4" + Version string = "0.4.5" CopyRight string = "©2022 Jan Lerking" STD_MESS string = "Ready" LogFile string = "BeadImager.log"