diff options
| author | Jeff Carr <[email protected]> | 2022-10-19 13:23:22 -0500 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2022-10-19 13:23:22 -0500 |
| commit | f3af1f5b7ff78b3f73d7510622fc9633dec36d35 (patch) | |
| tree | e4868584d5e19942938aaa122b2e1cab377db000 /group.go | |
| parent | f7b1036e544238d65b0e3ad46d08075aa4177032 (diff) | |
Refactor to 'gui/toolkit/'
* add a example cmds/consolemouse
uses a console button to launch the andlabs/ui
* fix wrong return value in toolkit/NewLabel()
* redirect STDIN output to a file
* wonderful fix of Window() exit
* finally remove the ancient stupid variables x & y
* phase out struct 'box' and use 'node' instead
* better names for things: use NewFoo() and NewBar()
Diffstat (limited to 'group.go')
| -rw-r--r-- | group.go | 62 |
1 files changed, 15 insertions, 47 deletions
@@ -4,60 +4,28 @@ import "log" import toolkit "git.wit.org/wit/gui/toolkit/andlabs" -import "github.com/andlabs/ui" -import _ "github.com/andlabs/ui/winmanifest" - +// TODO: which name is better. AddGroup or NewGroup ? +// first reaction is NewGroup func (n *Node) NewGroup(name string) *Node { - var t *toolkit.Toolkit - var gNode, bNode *Node + var newT *toolkit.Toolkit + var gNode *Node log.Println("toolkit.NewGroup() START", name) + if (n.Toolkit == nil) { + log.Println("toolkit.NewGroup() Toolkit == nil") + panic("Toolkit should never be nil") + } + // make a *Node with a *toolkit.Group - gNode = n.AddNode(name + " part1") - t = toolkit.NewGroup(n.uiBox, name) - gNode.Toolkit = t + gNode = n.New(name + " part1") + newT = n.Toolkit.NewGroup(name) + gNode.Toolkit = newT + log.Println("################## gNode ####### ", name) gNode.Dump() - // make a *Node with a *toolkit.Box - bNode = n.AddNode(name + " part2") - bNode.Toolkit = t.NewBox() - bNode.uiBox = bNode.Toolkit.GetBox() - bNode.Dump() - return bNode + return gNode } func (n *Node) AddGroup(title string) *Node { - return n.NewGroup(title) + return n.NewGroup(title + "deprecated AddGroup") } - -func (n *Node) AddGroupOld(title string) *Node { - if (n == nil) { - return nil - } - hbox := n.uiBox - if (hbox == nil) { - return n - } - group := ui.NewGroup(title) - group.SetMargined(true) - hbox.Append(group, true) - - vbox := ui.NewVerticalBox() - vbox.SetPadded(true) - group.SetChild(vbox) - - newNode := n.AddNode(title) - newNode.uiBox = vbox - return newNode -} - -/* -func (n *Node) NewGroup(title string) *Node { - group := ui.NewGroup(title) - group.SetMargined(true) - hbox.Append(group, true) - - vbox := ui.NewVerticalBox() - vbox.SetPadded(true) - group.SetChild(vbox) -*/ |
