diff --git a/main.go b/main.go index e3e651b..9436c8b 100644 --- a/main.go +++ b/main.go @@ -27,7 +27,7 @@ type MyMainWindow struct { const ( AppName string = "BeadImager" - Version string = "0.0.16" + Version string = "0.0.17" CopyRight string = "©2022 Jan Lerking" STD_MESS string = "Ready" UserPath string = "C:\\Users\\janle\\BeadImager" @@ -45,6 +45,7 @@ func main() { }) mw := &MyMainWindow{} mw.properties = new(properties) + mw.properties.propCanvas = new(PropCanvas) log.Println("MainWindow created") CreatePallette(mw) log.Println("Pallette created: ", mw.pallette) @@ -52,6 +53,7 @@ func main() { brand_trigged := false serie_trigged := false pegboard_trigged := false + settings_trigged := false DD_Pallette := GroupBox{ Title: "Pallette", @@ -148,7 +150,12 @@ func main() { AssignTo: &mw.MainWindow, Title: AppName + " " + Version, MinSize: Size{800, 600}, - + OnSizeChanged: func() { + if !settings_trigged { + mw.properties.propCanvas.newCanvasProperties(mw) + settings_trigged = true + } + }, Layout: VBox{MarginsZero: true}, Children: []Widget{ Composite{ diff --git a/properties.go b/properties.go index 37f46df..02e6acd 100644 --- a/properties.go +++ b/properties.go @@ -26,7 +26,7 @@ type ( } ) -func (cp *PropCanvas) newPropCanvas(mw *MyMainWindow) { +func (cp *PropCanvas) newCanvasProperties(mw *MyMainWindow) { var err error log.Println("Creating canvas properties...") cp.property, err = walk.NewComposite(mw.propScroll) @@ -35,33 +35,40 @@ func (cp *PropCanvas) newPropCanvas(mw *MyMainWindow) { } cp.property.SetAlignment(walk.AlignHNearVNear) vb := walk.NewVBoxLayout() - vb.SetMargins(walk.Margins{5, 0, 20, 0}) + //vb.SetMargins(walk.Margins{5, 0, 5, 0}) cp.property.SetLayout(vb) grcom, _ := walk.NewComposite(cp.property) + grcom.SetAlignment(walk.AlignHNearVNear) hb := walk.NewHBoxLayout() - hb.SetMargins(walk.Margins{5, 0, 20, 0}) + hb.SetMargins(walk.Margins{0, 0, 0, 0}) grcom.SetLayout(hb) log.Println("Creating grid checkbox") cb, _ := walk.NewCheckBox(grcom) + cb.SetAlignment(walk.AlignHNearVNear) cb.SetText("Show grid") log.Println("Grid checkbox created") walk.NewHSpacer(grcom) log.Println("Creating grid color button") grcolb, _ := walk.NewPushButton(grcom) + cb.SetAlignment(walk.AlignHFarVNear) grcolb.SetText("Grid color") log.Println("Grid color button created") log.Println("Creating pixels checkbox") cb, _ = walk.NewCheckBox(cp.property) + cb.SetAlignment(walk.AlignHNearVNear) cb.SetText("Show pixels as beads") log.Println("Pixels checkbox created") log.Println("Creating canvas background color button") grcolb, _ = walk.NewPushButton(cp.property) - grcolb.SetText("Grid color") - log.Println("Grid color button created") + grcolb.SetAlignment(walk.AlignHFarVNear) + 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 { - return new(properties) +func newPropCanvas() *PropCanvas { + return new(PropCanvas) } func newPropScale() *PropScale {