diff options
| -rw-r--r-- | click.go | 68 |
1 files changed, 15 insertions, 53 deletions
@@ -102,9 +102,11 @@ func (w *guiWidget) doWidgetClick() { log.Log(NOW, "doWidgetClick() if this is the dropdown menu, handle it here?") case widget.Window: log.Log(NOW, "doWidgetClick() START on window", w.String()) - // if me.currentWindow == w.node { - // return - // } + if me.currentWindow == w.node { + if ! w.active { + return + } + } if me.currentWindow != nil { var curw *guiWidget curw = me.currentWindow.TK.(*guiWidget) @@ -116,56 +118,16 @@ func (w *guiWidget) doWidgetClick() { log.Log(NOW, "doWidgetClick() set currentWindow to", w.String()) w.setColor(&colorActiveW) - if w.active { - w.active = false - w.dumpTree("before") - w.placeWidgets(3, 2) - w.showWidgets() - w.dumpTree("after") - } else { - w.active = true - w.hideWidgets() - } - /* - w.redoTabs(me.TabW, me.TabH) - for _, child := range w.children { - if child.currentTab == true { - log.Log(NOW, "FOUND CURRENT TAB", child.String()) - child.setCurrentTab() - child.placeWidgets(me.RawW, me.RawH) - child.showWidgets() - return - } - } - */ - /* FIXME: redo this - if ! n.hasTabs { - } - */ - /* - case widget.Tab: - if w.IsCurrent() { - return // do nothing if you reclick on the already selected tab - } - // find the window and disable the active tab - p := w.parent - if p != nil { - p.hideWidgets() - p.redoTabs(me.TabW, me.TabH) - p.unsetCurrent() - for _, child := range w.children { - if child.WidgetType == widget.Tab { - child.setColor(&colorTab) - child.currentTab = false - } - } - } - w.currentTab = true - w.setColor(&colorActiveT) - w.setCurrentTab() - w.placeWidgets(me.RawW, me.RawH) - w.showWidgets() - */ + + w.active = false + w.dumpTree("before") + w.placeWidgets(3, 2) + w.showWidgets() + + w.hideFake() + showDebug = true + + w.dumpTree("after") case widget.Group: // n.placeWidgets(p.tk.startH, newH) w.dumpTree("click start") |