jcarr
/
new-gui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove old function name 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-05-23 16:09:22 -07:00
parent cc5fc8d6a5
commit 3dca760b3e
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
area.go
View File

@ -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") log.Println("GOT MOUSE UP")
log.Println("GOT MOUSE UP") log.Println("GOT MOUSE UP")
if (Data.ButtonClickNew != nil) { if (Data.ButtonClick != nil) {
Data.ButtonClickNew(nil) Data.ButtonClick(nil)
} }
} }
} }

7
gui.go
View File

@ -20,8 +20,7 @@ type GuiDataStructure struct {
MainWindow *ui.Window MainWindow *ui.Window
Width int Width int
Height int Height int
ButtonClick func(int, string) ButtonClick func(*ButtonMap)
ButtonClickNew func(*ButtonMap)
CurrentVM string CurrentVM string
MyArea *ui.Area MyArea *ui.Area
Version string Version string
@ -178,8 +177,8 @@ func defaultButtonClick(button *ui.Button) {
log.Println("\tBUTTON MATCHED") log.Println("\tBUTTON MATCHED")
log.Println("\tData.allButtons[key].Name", Data.allButtons[key].Name) log.Println("\tData.allButtons[key].Name", Data.allButtons[key].Name)
log.Println("\tData.allButtons[key].Note", Data.allButtons[key].Note) log.Println("\tData.allButtons[key].Note", Data.allButtons[key].Note)
if (Data.ButtonClickNew != nil) { if (Data.ButtonClick != nil) {
Data.ButtonClickNew( &Data.allButtons[key]) Data.ButtonClick( &Data.allButtons[key])
} else if Data.allButtons[key].custom != nil { } else if Data.allButtons[key].custom != nil {
Data.allButtons[key].custom(42, "BUTTON DOES NOTHING") Data.allButtons[key].custom(42, "BUTTON DOES NOTHING")
} }

14
tabWindow.go
View File

@ -16,7 +16,7 @@ func buttonClick(i int, s string) {
if (Data.ButtonClick != nil) { if (Data.ButtonClick != nil) {
log.Println("Data.ButtonClick() START") 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) Data.cloudWindow = ui.NewWindow("", 640, 480, true)
// cloudWindow.SetBorderless(true) // cloudWindow.SetBorderless(true)
Data.cloudWindow.OnClosing(func(*ui.Window) bool { Data.cloudWindow.OnClosing(func(*ui.Window) bool {
if (Data.ButtonClickNew != nil) { if (Data.ButtonClick != nil) {
log.Println("Data.ButtonClickNew() START QUIT") log.Println("Data.ButtonClick() START QUIT")
Data.State = "QUIT" Data.State = "QUIT"
Data.ButtonClickNew(nil) Data.ButtonClick(nil)
} }
// ui.Quit() // ui.Quit()
return true return true
}) })
ui.OnShouldQuit(func() bool { ui.OnShouldQuit(func() bool {
if (Data.ButtonClickNew != nil) { if (Data.ButtonClick != nil) {
log.Println("Data.ButtonClickNew() START QUIT") log.Println("Data.ButtonClick() START QUIT")
Data.State = "QUIT" Data.State = "QUIT"
Data.ButtonClickNew(nil) Data.ButtonClick(nil)
} }
// Data.cloudWindow.Destroy() // Data.cloudWindow.Destroy()
return true return true