diff options
Diffstat (limited to 'place.go')
| -rw-r--r-- | place.go | 24 |
1 files changed, 11 insertions, 13 deletions
@@ -37,41 +37,40 @@ import ( // ----------------------------- func place(p *tree.Node, n *tree.Node) bool { - log.Warn("SPEEDY newplace() 1 START", n.WidgetId, n.GetProgName(), n.GetLabel(), n.String()) - log.Warn("SPEEDY newplace() n.State.Strings =", n.State.Strings) log.Log(INFO, "place() 1 START", n.WidgetType, n.GetProgName(), n.GetLabel()) if !ready(n) { - log.Warn("place() 1 START not ready()") + if n.WidgetType == widget.Window { + // TODO: figure out window in window placement + return true + } + log.Log(ERROR, "place() 1 START not ready()", n.WidgetType, n.GetProgName(), n.GetLabel()) return false } - log.Log(INFO, "place() 1 START ready()") var tk, ptk *guiWidget tk = n.TK.(*guiWidget) ptk = p.TK.(*guiWidget) - log.Warn("SPEEDY newplace() 2 START", n.WidgetId, n.GetProgName(), n.GetLabel()) if ptk == nil { log.Log(ERROR, "ptk == nil", p.GetProgName(), p.ParentId, p.WidgetType, ptk) log.Log(ERROR, "n = ", n.GetProgName(), n.ParentId, n.WidgetType, tk) - log.Warn("SPEEDY ptk == nil", n.WidgetId, n.GetProgName()) + log.Log(ERROR, "SPEEDY ptk == nil", n.WidgetId, n.GetProgName()) log.Sleep(1) panic("ptk == nil") } - log.Log(INFO, "place() switch", p.WidgetType) - log.Warn("SPEEDY newplace() before switch", n.WidgetId, n.GetProgName()) + log.Log(INFO, "place() switch", p.WidgetType, n.WidgetId, n.GetProgName()) switch p.WidgetType { case widget.Grid: tk.gridX = n.State.GridOffset.X - 1 tk.gridY = n.State.GridOffset.Y - 1 - log.Warn("place() on Grid at gridX,gridY", tk.gridX, tk.gridY) + log.Log(INFO, "place() on Grid at gridX,gridY", tk.gridX, tk.gridY) ptk.uiGrid.Append(tk.uiControl, tk.gridX, tk.gridY, 1, 1, false, ui.AlignFill, false, ui.AlignFill) return true case widget.Group: if ptk.uiBox == nil { - log.Log(WARN, "place() andlabs hack group to use add a box", n.GetProgName(), n.WidgetType) + log.Log(ANDLABS, "place() andlabs hack group to use add a box", n.GetProgName(), n.WidgetType) n.State.Direction = widget.Vertical ptk.uiBox = rawBox(n) ptk.uiGroup.SetChild(ptk.uiBox) @@ -99,7 +98,6 @@ func place(p *tree.Node, n *tree.Node) bool { ptk.boxC += 1 return true case widget.Box: - log.Warn("SPEEDY Add Something to Box", n.WidgetId, n.GetProgName()) log.Log(INFO, "place() uiBox =", ptk.uiBox) log.Log(INFO, "place() uiControl =", tk.uiControl) if n.WidgetType == widget.Textbox { @@ -110,12 +108,12 @@ func place(p *tree.Node, n *tree.Node) bool { ptk.boxC += 1 return true case widget.Window: - log.Warn("SPEEDY Add Something to Window", n.WidgetId, n.GetProgName()) + log.Log(INFO, "Adding Something to Window", n.WidgetId, n.GetProgName()) ptk.uiWindow.SetChild(tk.uiControl) return true default: log.Log(ERROR, "place() how? Parent =", p.WidgetId, p.WidgetType) } - log.Warn("SPEEDY newplace() return", n.WidgetId, n.GetProgName()) + log.Log(ERROR, "newplace() returned without doing anything", n.WidgetId, n.GetProgName()) return false } |