diff options
| -rw-r--r-- | area.go | 4 | ||||
| -rw-r--r-- | gui.go | 7 | ||||
| -rw-r--r-- | tabWindow.go | 14 |
3 files changed, 12 insertions, 13 deletions
@@ -88,8 +88,8 @@ func (ah areaHandler) MouseEvent(a *ui.Area, me *ui.AreaMouseEvent) { log.Println("GOT MOUSE UP") log.Println("GOT MOUSE UP") log.Println("GOT MOUSE UP") - if (Data.ButtonClickNew != nil) { - Data.ButtonClickNew(nil) + if (Data.ButtonClick != nil) { + Data.ButtonClick(nil) } } } @@ -20,8 +20,7 @@ type GuiDataStructure struct { MainWindow *ui.Window Width int Height int - ButtonClick func(int, string) - ButtonClickNew func(*ButtonMap) + ButtonClick func(*ButtonMap) CurrentVM string MyArea *ui.Area Version string @@ -178,8 +177,8 @@ func defaultButtonClick(button *ui.Button) { log.Println("\tBUTTON MATCHED") log.Println("\tData.allButtons[key].Name", Data.allButtons[key].Name) log.Println("\tData.allButtons[key].Note", Data.allButtons[key].Note) - if (Data.ButtonClickNew != nil) { - Data.ButtonClickNew( &Data.allButtons[key]) + if (Data.ButtonClick != nil) { + Data.ButtonClick( &Data.allButtons[key]) } else if Data.allButtons[key].custom != nil { Data.allButtons[key].custom(42, "BUTTON DOES NOTHING") } diff --git a/tabWindow.go b/tabWindow.go index f7a824d..dd82af2 100644 --- a/tabWindow.go +++ b/tabWindow.go @@ -16,7 +16,7 @@ func buttonClick(i int, s string) { if (Data.ButtonClick != nil) { log.Println("Data.ButtonClick() START") - Data.ButtonClick(i, s) + Data.ButtonClick(nil) } } @@ -61,19 +61,19 @@ func makeCloudWindow() { Data.cloudWindow = ui.NewWindow("", 640, 480, true) // cloudWindow.SetBorderless(true) Data.cloudWindow.OnClosing(func(*ui.Window) bool { - if (Data.ButtonClickNew != nil) { - log.Println("Data.ButtonClickNew() START QUIT") + if (Data.ButtonClick != nil) { + log.Println("Data.ButtonClick() START QUIT") Data.State = "QUIT" - Data.ButtonClickNew(nil) + Data.ButtonClick(nil) } // ui.Quit() return true }) ui.OnShouldQuit(func() bool { - if (Data.ButtonClickNew != nil) { - log.Println("Data.ButtonClickNew() START QUIT") + if (Data.ButtonClick != nil) { + log.Println("Data.ButtonClick() START QUIT") Data.State = "QUIT" - Data.ButtonClickNew(nil) + Data.ButtonClick(nil) } // Data.cloudWindow.Destroy() return true |