REORG: move more find() functions into find.go

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2021-10-25 06:50:27 -05:00
parent 3fa94aeb01
commit af1daa80a0
3 changed files with 36 additions and 38 deletions

38
find.go
View File

@ -4,11 +4,45 @@ import (
"log"
"os"
// "github.com/andlabs/ui"
// _ "github.com/andlabs/ui/winmanifest"
"github.com/andlabs/ui"
_ "github.com/andlabs/ui/winmanifest"
// "github.com/davecgh/go-spew/spew"
)
func (n *Node) FindTab() *ui.Tab {
return n.uiTab
}
func (n *Node) FindControl() *ui.Control {
return n.uiControl
}
func (n *Node) FindBox() *GuiBox {
return n.box
}
func (n *Node) FindWindowBox() *GuiBox {
if (n.box == nil) {
panic("SERIOUS ERROR n.box == nil in FindWindowBox()")
}
return n.box
}
func (w *GuiWindow) FindNode() *Node {
return w.node
}
func (b *GuiBox) FindNode() *Node {
log.Println("gui.FindNode() on GuiBox")
if b.node != nil {
return b.node
}
Data.ListChildren(true)
b.Dump()
log.Println("gui.FindNode() on GuiBox is nil")
os.Exit(-1)
return nil
}
func FindWindow(s string) *GuiWindow {
for name, window := range Data.WindowMap {

View File

@ -106,25 +106,6 @@ func (n *Node) SetName(name string) {
return
}
func (n *Node) FindTab() *ui.Tab {
return n.uiTab
}
func (n *Node) FindControl() *ui.Control {
return n.uiControl
}
func (n *Node) FindBox() *GuiBox {
return n.box
}
func (n *Node) FindWindowBox() *GuiBox {
if (n.box == nil) {
panic("SERIOUS ERROR n.box == nil in FindWindowBox()")
}
return n.box
}
func (n *Node) Append(child *Node) {
// if (n.UiBox == nil) {
// return

View File

@ -3,7 +3,6 @@ package gui
import (
"image/color"
"log"
"os"
"github.com/andlabs/ui"
"golang.org/x/image/font"
@ -169,22 +168,6 @@ func (b *GuiBox) SetNode(n *Node) {
}
}
func (w *GuiWindow) FindNode() *Node {
return w.node
}
func (b *GuiBox) FindNode() *Node {
log.Println("gui.FindNode() on GuiBox")
if b.node != nil {
return b.node
}
Data.ListChildren(true)
b.Dump()
log.Println("gui.FindNode() on GuiBox is nil")
os.Exit(-1)
return nil
}
func (s GuiBox) Append(child ui.Control, x bool) {
if s.UiBox == nil {
return