jcarr
/
cloud-control-panel
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

start handling 'GuiWindow' correctly 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-06-01 13:42:03 -07:00
parent cd4ef60acc
commit 7731f5fbf6
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
main.go
View File

@ -170,7 +170,7 @@ func mainMouseClick(b *gui.GuiButton) {
gw = b.GW gw = b.GW
} else { } else {
if (b.Box != nil) { if (b.Box != nil) {
gw = b.Box.W gw = b.Box.Window
} }
} }
if (gw == nil) { if (gw == nil) {
@ -190,13 +190,13 @@ func mainMouseClick(b *gui.GuiButton) {
log.Println("\tmainMouseClick() b.Box = nil") log.Println("\tmainMouseClick() b.Box = nil")
os.Exit(-1) os.Exit(-1)
} }
if (b.Box.Area == nil) { if (gw.Area == nil) {
log.Println("\tmainMouseClick() b.Box.Area = nil") log.Println("\tmainMouseClick() gw.Area = nil")
os.Exit(-1) os.Exit(-1)
} }
b.Box.Area.UiAttrstr = getNEWTEXT() gw.Area.UiAttrstr = getNEWTEXT()
log.Println("Area.UiAttrstr = ", b.Box.Area.UiAttrstr) log.Println("Area.UiAttrstr = ", gw.Area.UiAttrstr)
b.Box.Area.UiArea.QueueRedrawAll() gw.Area.UiArea.QueueRedrawAll()
} else if (b.Action == "AREA") { } else if (b.Action == "AREA") {
if (config == nil) { if (config == nil) {
log.Println("gui.State = splash BUT SOMETHING HAS GONE VERY WRONG") log.Println("gui.State = splash BUT SOMETHING HAS GONE VERY WRONG")
@ -454,11 +454,11 @@ func watchGUI() {
for { for {
if (count > 10) { if (count > 10) {
log.Println("Sleep() in watchGUI() gui.Data.State =", gui.Data.State) log.Println("Sleep() in watchGUI() gui.Data.State =", gui.Data.State)
for key, window := range gui.Data.Windows { for i, window := range gui.Data.Windows {
log.Println("watchGUI() gui.Data.Windows =", key, window) log.Println("watchGUI() gui.Data.Windows i =", i)
log.Println("watchGUI() gui.Data.Windows.Action =", key, window.Action) log.Println("\twatchGUI() gui.Data.Windows.Action =", window.Action)
for name, box := range window.BoxMap { for name, box := range window.BoxMap {
log.Println("watchGUI() name, box =", name, box) log.Println("\twatchGUI() name, box =", name, box)
} }
} }
count = 0 count = 0
@ -486,7 +486,10 @@ func watchGUI() {
func makeCloudInfoBox(gw *gui.GuiWindow) { func makeCloudInfoBox(gw *gui.GuiWindow) {
log.Println("makeCloudInfoBox() START gw =", gw) log.Println("makeCloudInfoBox() START gw =", gw)
box := gui.ShowMainTab(gw) box := gui.AddMainTab(gw)
gw = box.Window
log.Println("makeCloudInfoBox() START GW IS NOW: gw =", gw)
log.Println("makeCloudInfoBox() box =", box) log.Println("makeCloudInfoBox() box =", box)
gui.NewLabel(box, "Hostname:") gui.NewLabel(box, "Hostname:")