diff options
| -rw-r--r-- | click.go | 17 | ||||
| -rw-r--r-- | debug.go | 6 | ||||
| -rw-r--r-- | gocui.go | 6 | ||||
| -rw-r--r-- | keybindings.go | 9 | ||||
| -rw-r--r-- | place.go | 4 | ||||
| -rw-r--r-- | view.go | 2 |
6 files changed, 30 insertions, 14 deletions
@@ -119,8 +119,10 @@ func (w *guiWidget) doWidgetClick() { w.setColor(&colorActiveW) if w.active { w.active = false - w.placeWidgets(me.RawW, me.RawH) + w.dumpTree("before") + w.placeWidgets(3, 2) w.showWidgets() + w.dumpTree("after") } else { w.active = true w.hideWidgets() @@ -165,22 +167,27 @@ func (w *guiWidget) doWidgetClick() { w.showWidgets() case widget.Group: // n.placeWidgets(p.tk.startH, newH) + w.dumpTree("click start") if w.active { w.active = false - startW := me.RawW - startH := me.RawH + startW := w.parent.AtW + startH := w.parent.AtH + w.placeWidgets(startW, startH) + w.showWidgets() + /* for _, child := range w.children { log.Log(INFO, "START W,H", startW, startH) - child.placeWidgets(me.RawW, me.RawH) + child.placeWidgets(startW, startH) child.showWidgets() } + */ } else { w.active = true for _, child := range w.children { child.hideWidgets() } } - w.dumpTree() + w.dumpTree("click end") case widget.Checkbox: if widget.GetBool(w.value) { w.setCheckbox(false) @@ -7,16 +7,16 @@ import ( "go.wit.com/widget" ) -func (w *guiWidget) dumpTree() { +func (w *guiWidget) dumpTree(s string) { // log.Log(ERROR, "dumpTree w", w.node.WidgetId, w.WidgetType, w.String()) if w == nil { log.Log(ERROR, "dumpTree w.TK == nil", w.node.WidgetId, w.WidgetType, w.String()) return } - w.showWidgetPlacement("dumpTree()") + w.showWidgetPlacement("dumpTree() " + s) for _, child := range w.children { - child.dumpTree() + child.dumpTree(s) } } @@ -50,7 +50,7 @@ func gocuiMain() { func gocuiEvent(g *gocui.Gui) error { maxX, maxY := g.Size() mx, my := g.MousePosition() - log.Log(NOW, "handleEvent() START", maxX, maxY, mx, my, msgMouseDown) + log.Verbose("handleEvent() START", maxX, maxY, mx, my, msgMouseDown) if _, err := g.View("msg"); msgMouseDown && err == nil { moveMsg(g) } @@ -61,10 +61,10 @@ func gocuiEvent(g *gocui.Gui) error { // setOutput(me.logStdout) } } else { - log.Log(INFO, "output widget already exists", maxX, maxY, mx, my) + log.Verbose("output widget already exists", maxX, maxY, mx, my) } mouseMove(g) - log.Log(INFO, "handleEvent() END ", maxX, maxY, mx, my, msgMouseDown) + log.Verbose("handleEvent() END ", maxX, maxY, mx, my, msgMouseDown) return nil } diff --git a/keybindings.go b/keybindings.go index 902eed8..d570367 100644 --- a/keybindings.go +++ b/keybindings.go @@ -119,7 +119,14 @@ func addDebugKeys(g *gocui.Gui) { g.SetKeybinding("", 'M', gocui.ModNone, func(g *gocui.Gui, v *gocui.View) error { w := me.treeRoot.TK.(*guiWidget) - w.dumpTree() + w.dumpTree("M") + return nil + }) + + // redo windows + g.SetKeybinding("", 'w', gocui.ModNone, + func(g *gocui.Gui, v *gocui.View) error { + redoWindows(0, 0) return nil }) @@ -65,7 +65,7 @@ func (tk *guiWidget) placeWidgets(startW int, startH int) { case widget.Group: // move the group to the parent's next location tk.gocuiSetWH(startW, startH) - tk.showWidgetPlacement("group()") + tk.dumpTree("start place") newW := startW + me.GroupPadW newH := startH + 3 // normal hight of the group label @@ -78,7 +78,9 @@ func (tk *guiWidget) placeWidgets(startW int, startH int) { // increment straight down newH += h + log.Log(INFO, "REAL HIGHT ADDED", h, "newH", newH) } + tk.dumpTree("end place") default: tk.gocuiSetWH(startW, startH) // n.moveTo(startW, startH) @@ -174,7 +174,7 @@ func (w *guiWidget) recreateView() { } if w.String() == "CLOUDFLARE_EMAIL" { w.showWidgetPlacement("w.String()="+w.String()+" w.label="+w.labelN+" "+w.cuiName) - w.dumpTree() + w.dumpTree("cloudflare") } log.Log(ERROR, "recreateView() END") } |