Merge branch 'master' into devel

1 files changed, 38 insertions, 20 deletions

diff --git a/debug.go b/debug.go
index 42937d1..1a20532 100644
--- a/debug.go
+++ b/debug.go
@@ -3,11 +3,11 @@ package gui
 import "log"
 import "time"
 import "fmt"
-// import "reflect"
+import "reflect"
 
 // import "github.com/andlabs/ui"
 // import _ "github.com/andlabs/ui/winmanifest"
-// import "github.com/davecgh/go-spew/spew"
+import "github.com/davecgh/go-spew/spew"
 // import pb "git.wit.com/wit/witProtobuf"
 
 //
@@ -20,24 +20,8 @@ func WatchGUI() {
 	for {
 		if (count > 20) {
 			log.Println("Sleep() in watchGUI()")
-			for i, window := range Data.Windows {
-				log.Println("watchGUI() Data.Windows", i, "Name =", window.Name)
-				for name, abox := range window.BoxMap {
-					log.Printf("\twatchGUI() BOX mapname=%-12s abox.Name=%-12s", name, abox.Name)
-					/*
-					if (name == "DEBUG") {
-						log.Println("\t\twatchGUI() BOX abox =", reflect.TypeOf(abox))
-						win := abox.Window
-						log.Println("\t\twatchGUI() BOX win =", reflect.TypeOf(win))
-						area := win.Area
-						log.Println("\t\twatchGUI() BOX area =", reflect.TypeOf(area), area.UiArea)
-						// spew.Dump(area.UiArea)
-						// area.UiArea.Show()
-						// time.Sleep(2000 * time.Millisecond)
-						// os.Exit(0)
-					}
-					*/
-				}
+			if (Config.Debug) {
+				DumpBoxes()
 			}
 			count = 0
 		}
@@ -46,6 +30,40 @@ func WatchGUI() {
 	}
 }
 
+func DumpBoxes() {
+	for name, window := range Data.WindowMap {
+		log.Println("gui.DumpBoxes()", name)
+		log.Println("gui.DumpBoxes()\tWindow.name =", window.Name)
+		log.Println("gui.DumpBoxes()\tWindow.UiWindow type =", reflect.TypeOf(window.UiWindow))
+		log.Println("gui.DumpBoxes()\tWindow.UiWindow =", window.UiWindow)
+		if (window.UiTab != nil) {
+			log.Println("gui.DumpBoxes()\tWindow.UiTab type =", reflect.TypeOf(window.UiTab))
+			log.Println("gui.DumpBoxes()\tWindow.UiTab =", window.UiTab)
+			log.Println("gui.DumpBoxes()\tWindow.UiTab.NumPages() =", window.UiTab.NumPages())
+			spew.Dump(window.UiTab)
+		}
+	}
+	for i, window := range Data.Windows {
+		log.Println("gui.DumpBoxes() Data.Windows", i, "Name =", window.Name)
+		for name, abox := range window.BoxMap {
+			log.Printf("gui.DumpBoxes() \tBOX mapname=%-12s abox.Name=%-12s", name, abox.Name)
+			/*
+			if (name == "DEBUG") {
+				log.Println("\t\twatchGUI() BOX abox =", reflect.TypeOf(abox))
+				win := abox.Window
+				log.Println("\t\twatchGUI() BOX win =", reflect.TypeOf(win))
+				area := win.Area
+				log.Println("\t\twatchGUI() BOX area =", reflect.TypeOf(area), area.UiArea)
+				// spew.Dump(area.UiArea)
+				// area.UiArea.Show()
+				// time.Sleep(2000 * time.Millisecond)
+				// os.Exit(0)
+			}
+			*/
+		}
+	}
+}
+
 func addTableTab() {
 	var parts []TableColumnData