more mouse click handling cleanups

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 10 insertions, 25 deletions

diff --git a/tabWindow.go b/tabWindow.go
index e08b4cf..5984aac 100644
--- a/tabWindow.go
+++ b/tabWindow.go
@@ -8,25 +8,13 @@ import _ "github.com/andlabs/ui/winmanifest"
 
 // import "github.com/davecgh/go-spew/spew"
 
-func buttonClick(b *ButtonMap, s string) {
-	log.Println("gui.buttonClick() b, s =", b, s)
-	log.Println("Figure out what to do here")
-	log.Println("Figure out what to do here")
-	log.Println("Figure out what to do here")
-
-	if (Data.ButtonClick != nil) {
-		log.Println("Data.ButtonClick() START")
-		Data.ButtonClick(nil)
-	}
-}
-
 func ShowAccountQuestionTab() {
 	Data.cloudTab.Delete(0)
 
 	log.Println("Sleep(200)")
 	time.Sleep(200 * time.Millisecond)
 
-	Data.smallBox = AddAccountQuestionBox(nil, buttonClick)
+	Data.smallBox = AddAccountQuestionBox(nil, mouseClick)
 	Data.cloudTab.InsertAt("New Account?", 0, Data.smallBox)
 	Data.cloudTab.SetMargined(0, true)
 }
@@ -37,7 +25,7 @@ func ShowAccountTab() {
 	log.Println("Sleep(200)")
 	time.Sleep(200 * time.Millisecond)
 
-	Data.smallBox = AddAccountBox(buttonClick)
+	Data.smallBox = AddAccountBox(mouseClick)
 	Data.cloudTab.InsertAt("Add Account", 0, Data.smallBox)
 	Data.cloudTab.SetMargined(0, true)
 }
@@ -48,7 +36,7 @@ func ShowMainTab() {
 	log.Println("Sleep(200)")
 	time.Sleep(200 * time.Millisecond)
 
-	Data.smallBox = makeCloudInfoBox(buttonClick)
+	Data.smallBox = makeCloudInfoBox(mouseClick)
 	Data.cloudTab.InsertAt("Main", 0, Data.smallBox)
 	Data.cloudTab.SetMargined(0, true)
 }
@@ -61,21 +49,18 @@ func makeCloudWindow() {
 	Data.cloudWindow = ui.NewWindow("", 640, 480, true)
 	// cloudWindow.SetBorderless(true)
 	Data.cloudWindow.OnClosing(func(*ui.Window) bool {
-		if (Data.ButtonClick != nil) {
-			log.Println("Data.ButtonClick() START QUIT")
-			Data.State = "QUIT"
-			Data.ButtonClick(nil)
+		if (Data.MouseClick != nil) {
+			log.Println("SIMULATE Data.MouseClick(QUIT)")
+			Data.MouseClick(nil)
 		}
-		// ui.Quit()
 		return true
 	})
 	ui.OnShouldQuit(func() bool {
-		if (Data.ButtonClick != nil) {
-			log.Println("Data.ButtonClick() START QUIT")
+		if (Data.MouseClick != nil) {
+			log.Println("SIMULATE Data.MouseClick(QUIT)")
 			Data.State = "QUIT"
-			Data.ButtonClick(nil)
+			Data.MouseClick(nil)
 		}
-		// Data.cloudWindow.Destroy()
 		return true
 	})
 
@@ -83,7 +68,7 @@ func makeCloudWindow() {
 	Data.cloudWindow.SetChild(Data.cloudTab)
 	Data.cloudWindow.SetMargined(true)
 
-	Data.cloudBox = ShowSplashBox(nil, nil, buttonClick)
+	Data.cloudBox = ShowSplashBox(nil, nil, mouseClick)
 
 	Data.cloudTab.Append("WIT Splash", Data.cloudBox)
 	Data.cloudTab.SetMargined(0, true)