From a926aa300e90786ccd101124d31d6662e4788070 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 25 Oct 2021 09:34:31 -0500 Subject: [PATCH] NODE: minimal debug tab Signed-off-by: Jeff Carr --- new-structs.go | 4 +- window-debug.go | 2 +- window-demo-andlabs-ui.go | 2 +- window-demo.go | 82 ++++++++++++++++++--------------------- 4 files changed, 42 insertions(+), 48 deletions(-) diff --git a/new-structs.go b/new-structs.go index e86bb53..92933ed 100644 --- a/new-structs.go +++ b/new-structs.go @@ -209,7 +209,8 @@ func (parent *Node) AddTabNode(title string, b *GuiBox) *Node { return newNode } -func (parent *Node) AddTab(title string, uiC ui.Control) *Node { +// func (parent *Node) AddTab(title string, uiC ui.Control) *Node { +func (parent *Node) AddTab(title string, uiC *ui.Box) *Node { log.Println("gui.Node.AddTab() START name =", title) if parent.uiWindow == nil { parent.Dump() @@ -243,6 +244,7 @@ func (parent *Node) AddTab(title string, uiC ui.Control) *Node { // panic("gui.AddTab() before makeNode()") newNode := parent.makeNode(title, 555, 600 + Config.counter) newNode.uiTab = tab + newNode.uiBox = uiC // panic("gui.AddTab() after makeNode()") return newNode } diff --git a/window-debug.go b/window-debug.go index afe3918..4b8abb5 100644 --- a/window-debug.go +++ b/window-debug.go @@ -26,7 +26,7 @@ func addNodeName(c *ui.Combobox, s string) { y = y + 1 } -func makeWindowDebug() ui.Control { +func makeWindowDebug() *ui.Box { hbox := ui.NewHorizontalBox() hbox.SetPadded(true) diff --git a/window-demo-andlabs-ui.go b/window-demo-andlabs-ui.go index f7f5606..2c1f6cb 100644 --- a/window-demo-andlabs-ui.go +++ b/window-demo-andlabs-ui.go @@ -16,7 +16,7 @@ func (n *Node) AddAndlabsUiDemoTab(title string) { tabSetMargined(newNode.uiTab) } -func makeAndlabsUiTab() ui.Control { +func makeAndlabsUiTab() *ui.Box { hbox := ui.NewHorizontalBox() hbox.SetPadded(true) diff --git a/window-demo.go b/window-demo.go index 8d205b5..7f964ef 100644 --- a/window-demo.go +++ b/window-demo.go @@ -4,19 +4,24 @@ import "log" import "github.com/andlabs/ui" import _ "github.com/andlabs/ui/winmanifest" +var mybox *ui.Box + func (n *Node) AddDemoTab(title string) { newNode := n.AddTab(title, makeDemoTab()) if (Config.DebugNode) { newNode.Dump() } tabSetMargined(newNode.uiTab) + newNode.Dump() + newNode.ListChildren(false) + addDemoGroup(newNode.uiBox) } -func makeDemoTab() ui.Control { +func makeDemoTab() *ui.Box { hbox := ui.NewHorizontalBox() hbox.SetPadded(true) - group := ui.NewGroup("Numbers") + group := ui.NewGroup("DemoEditBox") group.SetMargined(true) hbox.Append(group, true) @@ -24,45 +29,10 @@ func makeDemoTab() ui.Control { vbox.SetPadded(true) group.SetChild(vbox) - spinbox := ui.NewSpinbox(47, 100) - slider := ui.NewSlider(21, 100) - pbar := ui.NewProgressBar() - - spinbox.OnChanged(func(*ui.Spinbox) { - slider.SetValue(spinbox.Value()) - pbar.SetValue(spinbox.Value()) - }) - slider.OnChanged(func(*ui.Slider) { - spinbox.SetValue(slider.Value()) - pbar.SetValue(slider.Value()) - }) - vbox.Append(spinbox, false) - vbox.Append(slider, false) - vbox.Append(pbar, false) - - ip := ui.NewProgressBar() - ip.SetValue(-1) - vbox.Append(ip, false) - - group = ui.NewGroup("Lists") - group.SetMargined(true) - hbox.Append(group, true) - - vbox = ui.NewVerticalBox() - vbox.SetPadded(true) - group.SetChild(vbox) - - cbox := ui.NewCombobox() - cbox.Append("Combobox Item 1") - cbox.Append("Combobox Item 2") - cbox.Append("Combobox Item 3") - vbox.Append(cbox, false) - ecbox := ui.NewEditableCombobox() - ecbox.Append("Editable Item 1") - ecbox.Append("Editable Item 2") - ecbox.Append("Editable Item 3") - vbox.Append(ecbox, false) + ecbox.Append("foo 1") + ecbox.Append("man 2") + ecbox.Append("bar 3") ecbox.OnChanged(func(*ui.EditableCombobox) { log.Println("test") @@ -70,11 +40,33 @@ func makeDemoTab() ui.Control { log.Println("test=", test) }) - rb := ui.NewRadioButtons() - rb.Append("Radio Button 1") - rb.Append("Radio Button 2") - rb.Append("Radio Button 3") - vbox.Append(rb, false) + vbox.Append(ecbox, false) return hbox } + +func addDemoGroup(hbox *ui.Box) { + if (hbox == nil) { + return + } + group := ui.NewGroup("DemoEditBox 2") + group.SetMargined(true) + hbox.Append(group, true) + + vbox := ui.NewVerticalBox() + vbox.SetPadded(true) + group.SetChild(vbox) + + ecbox := ui.NewEditableCombobox() + ecbox.Append("foo 1") + ecbox.Append("man 2") + ecbox.Append("bar 3") + + ecbox.OnChanged(func(*ui.EditableCombobox) { + log.Println("test") + test := ecbox.Text() + log.Println("test=", test) + }) + + vbox.Append(ecbox, false) +}