From f3bb68396afa7452ecf1c8d4744c825a9d81057c Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Sat, 25 Feb 2023 14:05:25 -0600
Subject: The debugging window is finally useful

    the gui enabled debugging works
        --gui-debug works from the command line
        The debug window can now select things
        debugging now includes widget types
        all the debug flags work
        finally working debugging flags via gui checkboxes
    add debian packaging rules
    use log() in the toolkit
    use a standard log() to simplify debugging flags
    add reference to 'GO Style Guide'
    use the same LICENSE from the GO developers.
    TODO: make this threadsafe
    TODO: fix plugin stuff

Signed-off-by: Jeff Carr <jcarr@wit.com>
---
 toolkit/andlabs/window.go | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

(limited to 'toolkit/andlabs/window.go')

diff --git a/toolkit/andlabs/window.go b/toolkit/andlabs/window.go
index b360cb8..7527ac5 100644
--- a/toolkit/andlabs/window.go
+++ b/toolkit/andlabs/window.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	"log"
-
 	"github.com/andlabs/ui"
 	_ "github.com/andlabs/ui/winmanifest"
 
@@ -20,12 +18,10 @@ func (t *andlabsT) ErrorWindow(msg1 string, msg2 string) {
 func NewWindow(w *toolkit.Widget) {
 	var t *andlabsT
 
-	if (DebugToolkit) {
-		log.Println("toolkit NewWindow", w.Name, w.Width, w.Height)
-	}
+	log(debugToolkit, "toolkit NewWindow", w.Name, w.Width, w.Height)
 
 	if (w == nil) {
-		log.Println("wit/gui plugin error. widget == nil")
+		log(debugToolkit, "wit/gui plugin error. widget == nil")
 		return
 	}
 	t = new(andlabsT)
@@ -37,21 +33,17 @@ func NewWindow(w *toolkit.Widget) {
 	win.SetBorderless(canvas)
 	win.SetMargined(margin)
 	win.OnClosing(func(*ui.Window) bool {
-		if (DebugToolkit) {
-			log.Println("ui.Window().OnExit() SHOULD ATTEMPT CALLBACK here")
-			t.Dump()
-		}
+		log(debugToolkit, "ui.Window().OnExit() SHOULD ATTEMPT CALLBACK here")
+		t.Dump()
 		if (w.Custom != nil) {
 			w.Custom()
 			return true
 		}
-		if (w.Event != nil) {
-			w.Event(w)
-			return true
-		}
-		if (DebugToolkit) {
-			log.Println("andlabs.ui.Window().OnClosing() was not defined")
-		}
+		// if (w.Event != nil) {
+		// 	w.Event(w)
+		// 	return true
+		// }
+		log(debugToolkit, "andlabs.ui.Window().OnClosing() was not defined")
 		return false
 	})
 	win.Show()
@@ -64,15 +56,11 @@ func NewWindow(w *toolkit.Widget) {
 }
 
 func (t *andlabsT) SetWindowTitle(title string) {
-	if (DebugToolkit) {
-		log.Println("toolkit NewWindow", t.Name, "title", title)
-	}
+	log(debugToolkit, "toolkit NewWindow", t.Name, "title", title)
 	win := t.uiWindow
 	if (win != nil) {
 		win.SetTitle(title)
 	} else {
-		if (DebugToolkit) {
-			log.Println("Setting the window title", title)
-		}
+		log(debugToolkit, "Setting the window title", title)
 	}
 }
-- 
cgit v1.2.3