0.0.17 Added canvas properties. /JL
This commit is contained in:
@@ -27,7 +27,7 @@ type MyMainWindow struct {
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
AppName string = "BeadImager"
|
AppName string = "BeadImager"
|
||||||
Version string = "0.0.16"
|
Version string = "0.0.17"
|
||||||
CopyRight string = "©2022 Jan Lerking"
|
CopyRight string = "©2022 Jan Lerking"
|
||||||
STD_MESS string = "Ready"
|
STD_MESS string = "Ready"
|
||||||
UserPath string = "C:\\Users\\janle\\BeadImager"
|
UserPath string = "C:\\Users\\janle\\BeadImager"
|
||||||
@@ -45,6 +45,7 @@ func main() {
|
|||||||
})
|
})
|
||||||
mw := &MyMainWindow{}
|
mw := &MyMainWindow{}
|
||||||
mw.properties = new(properties)
|
mw.properties = new(properties)
|
||||||
|
mw.properties.propCanvas = new(PropCanvas)
|
||||||
log.Println("MainWindow created")
|
log.Println("MainWindow created")
|
||||||
CreatePallette(mw)
|
CreatePallette(mw)
|
||||||
log.Println("Pallette created: ", mw.pallette)
|
log.Println("Pallette created: ", mw.pallette)
|
||||||
@@ -52,6 +53,7 @@ func main() {
|
|||||||
brand_trigged := false
|
brand_trigged := false
|
||||||
serie_trigged := false
|
serie_trigged := false
|
||||||
pegboard_trigged := false
|
pegboard_trigged := false
|
||||||
|
settings_trigged := false
|
||||||
|
|
||||||
DD_Pallette := GroupBox{
|
DD_Pallette := GroupBox{
|
||||||
Title: "Pallette",
|
Title: "Pallette",
|
||||||
@@ -148,7 +150,12 @@ func main() {
|
|||||||
AssignTo: &mw.MainWindow,
|
AssignTo: &mw.MainWindow,
|
||||||
Title: AppName + " " + Version,
|
Title: AppName + " " + Version,
|
||||||
MinSize: Size{800, 600},
|
MinSize: Size{800, 600},
|
||||||
|
OnSizeChanged: func() {
|
||||||
|
if !settings_trigged {
|
||||||
|
mw.properties.propCanvas.newCanvasProperties(mw)
|
||||||
|
settings_trigged = true
|
||||||
|
}
|
||||||
|
},
|
||||||
Layout: VBox{MarginsZero: true},
|
Layout: VBox{MarginsZero: true},
|
||||||
Children: []Widget{
|
Children: []Widget{
|
||||||
Composite{
|
Composite{
|
||||||
|
|||||||
+14
-7
@@ -26,7 +26,7 @@ type (
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
func (cp *PropCanvas) newPropCanvas(mw *MyMainWindow) {
|
func (cp *PropCanvas) newCanvasProperties(mw *MyMainWindow) {
|
||||||
var err error
|
var err error
|
||||||
log.Println("Creating canvas properties...")
|
log.Println("Creating canvas properties...")
|
||||||
cp.property, err = walk.NewComposite(mw.propScroll)
|
cp.property, err = walk.NewComposite(mw.propScroll)
|
||||||
@@ -35,33 +35,40 @@ func (cp *PropCanvas) newPropCanvas(mw *MyMainWindow) {
|
|||||||
}
|
}
|
||||||
cp.property.SetAlignment(walk.AlignHNearVNear)
|
cp.property.SetAlignment(walk.AlignHNearVNear)
|
||||||
vb := walk.NewVBoxLayout()
|
vb := walk.NewVBoxLayout()
|
||||||
vb.SetMargins(walk.Margins{5, 0, 20, 0})
|
//vb.SetMargins(walk.Margins{5, 0, 5, 0})
|
||||||
cp.property.SetLayout(vb)
|
cp.property.SetLayout(vb)
|
||||||
grcom, _ := walk.NewComposite(cp.property)
|
grcom, _ := walk.NewComposite(cp.property)
|
||||||
|
grcom.SetAlignment(walk.AlignHNearVNear)
|
||||||
hb := walk.NewHBoxLayout()
|
hb := walk.NewHBoxLayout()
|
||||||
hb.SetMargins(walk.Margins{5, 0, 20, 0})
|
hb.SetMargins(walk.Margins{0, 0, 0, 0})
|
||||||
grcom.SetLayout(hb)
|
grcom.SetLayout(hb)
|
||||||
log.Println("Creating grid checkbox")
|
log.Println("Creating grid checkbox")
|
||||||
cb, _ := walk.NewCheckBox(grcom)
|
cb, _ := walk.NewCheckBox(grcom)
|
||||||
|
cb.SetAlignment(walk.AlignHNearVNear)
|
||||||
cb.SetText("Show grid")
|
cb.SetText("Show grid")
|
||||||
log.Println("Grid checkbox created")
|
log.Println("Grid checkbox created")
|
||||||
walk.NewHSpacer(grcom)
|
walk.NewHSpacer(grcom)
|
||||||
log.Println("Creating grid color button")
|
log.Println("Creating grid color button")
|
||||||
grcolb, _ := walk.NewPushButton(grcom)
|
grcolb, _ := walk.NewPushButton(grcom)
|
||||||
|
cb.SetAlignment(walk.AlignHFarVNear)
|
||||||
grcolb.SetText("Grid color")
|
grcolb.SetText("Grid color")
|
||||||
log.Println("Grid color button created")
|
log.Println("Grid color button created")
|
||||||
log.Println("Creating pixels checkbox")
|
log.Println("Creating pixels checkbox")
|
||||||
cb, _ = walk.NewCheckBox(cp.property)
|
cb, _ = walk.NewCheckBox(cp.property)
|
||||||
|
cb.SetAlignment(walk.AlignHNearVNear)
|
||||||
cb.SetText("Show pixels as beads")
|
cb.SetText("Show pixels as beads")
|
||||||
log.Println("Pixels checkbox created")
|
log.Println("Pixels checkbox created")
|
||||||
log.Println("Creating canvas background color button")
|
log.Println("Creating canvas background color button")
|
||||||
grcolb, _ = walk.NewPushButton(cp.property)
|
grcolb, _ = walk.NewPushButton(cp.property)
|
||||||
grcolb.SetText("Grid color")
|
grcolb.SetAlignment(walk.AlignHFarVNear)
|
||||||
log.Println("Grid color button created")
|
grcolb.SetText("Background color")
|
||||||
|
log.Println("Background color button created")
|
||||||
|
bg, _ := walk.NewSolidColorBrush(walk.RGB(255, 255, 255))
|
||||||
|
cp.property.SetBackground(bg)
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewCanvasProperties() *properties {
|
func newPropCanvas() *PropCanvas {
|
||||||
return new(properties)
|
return new(PropCanvas)
|
||||||
}
|
}
|
||||||
|
|
||||||
func newPropScale() *PropScale {
|
func newPropScale() *PropScale {
|
||||||
|
|||||||
Reference in New Issue
Block a user