From 5e505b4f7ba2f0da11695fdb9a3c483548b79a89 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 2 Jun 2019 19:49:17 -0700 Subject: see if an interface can store the outside values also finally fixed the splash area logic Signed-off-by: Jeff Carr --- structs.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'structs.go') diff --git a/structs.go b/structs.go index d57e8a0..b2d55f3 100644 --- a/structs.go +++ b/structs.go @@ -95,14 +95,15 @@ type GuiBox struct { // call this 'GuiMouseClick' type GuiButton struct { Name string // field for human readable name - Action string // what type of button Box *GuiBox // what box the button click was in - Account *pb.Account // associated with what account? - VM *pb.Event_VM // associated with which VM? - // a callback function for the main application Custom func (*GuiButton) + Values interface {} + + Action string // what type of button + Account *pb.Account // associated with what account? + VM *pb.Event_VM // associated with which VM? // andlabs/ui abstraction mapping B *ui.Button @@ -119,9 +120,6 @@ type GuiEntry struct { B *GuiButton Box *GuiBox - Account *pb.Account - VM *pb.Event_VM - // andlabs/ui abstraction mapping UiEntry *ui.Entry } @@ -170,7 +168,6 @@ type TableData struct { Cells [20]CellData Human [20]HumanMap - Account *pb.Account // what account this table is for Box *GuiBox lastRow int @@ -198,7 +195,6 @@ type HumanCellData struct { TextID int Color color.RGBA ColorID int - VM *pb.Event_VM Button *GuiButton } @@ -232,9 +228,6 @@ type RowData struct { doubleclick func() // what function to call if the user double clicks on it */ HumanData [20]HumanCellData - - // The VM from the protobuf - VM *pb.Event_VM } // -- cgit v1.2.3