diff options
| -rw-r--r-- | entry.go | 8 | ||||
| -rw-r--r-- | toolkit/andlabs/label.go | 23 | ||||
| -rw-r--r-- | toolkit/andlabs/spinbox.go | 7 |
3 files changed, 34 insertions, 4 deletions
@@ -3,8 +3,12 @@ package gui import "log" // import "fmt" +import toolkit "git.wit.org/wit/gui/toolkit/andlabs" + import "github.com/andlabs/ui" import _ "github.com/andlabs/ui/winmanifest" + + import "github.com/davecgh/go-spew/spew" // functions for handling text entry boxes @@ -18,7 +22,9 @@ func (n *Node) NewLabel(text string) *Node { newNode := makeNode(n, text, 333, 334) newNode.Dump() - n.Append(newNode) + t := toolkit.NewLabel(n.uiBox, text) + newNode.Toolkit = t + return newNode } diff --git a/toolkit/andlabs/label.go b/toolkit/andlabs/label.go new file mode 100644 index 0000000..23d4927 --- /dev/null +++ b/toolkit/andlabs/label.go @@ -0,0 +1,23 @@ +package toolkit + +import "log" + +import "github.com/andlabs/ui" +import _ "github.com/andlabs/ui/winmanifest" + +func NewLabel(b *ui.Box, name string) *Toolkit { + // make new node here + log.Println("gui.Toolbox.NewLabel", name) + var t Toolkit + + if (b == nil) { + log.Println("gui.ToolboxNode.NewLabel() node.UiBox == nil. I can't add a range UI element without a place to put it") + return &t + } + l := ui.NewLabel(name) + t.uiLabel = l + t.uiBox = b + t.uiBox.Append(l, false) + + return &t +} diff --git a/toolkit/andlabs/spinbox.go b/toolkit/andlabs/spinbox.go index dca0502..ec268f1 100644 --- a/toolkit/andlabs/spinbox.go +++ b/toolkit/andlabs/spinbox.go @@ -19,14 +19,15 @@ type Toolkit struct { OnChanged func(*Toolkit) - uiControl *ui.Control + uiBox *ui.Box uiButton *ui.Button + uiControl *ui.Control + uiLabel *ui.Label uiSlider *ui.Slider uiSpinbox *ui.Spinbox - uiWindow *ui.Window uiTab *ui.Tab - uiBox *ui.Box uiText *ui.EditableCombobox + uiWindow *ui.Window } func (t *Toolkit) Value() int { |