more code cleanup

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-05-29 21:07:19 -07:00
parent 702e96ce3e
commit 9f4cfa9155
1 changed files with 11 additions and 21 deletions

View File

@ -217,20 +217,7 @@ func GoMainWindow() {
} }
*/ */
func ShowWindow() { func StartNewWindow(c *pb.Config, action string) {
// Data.Window1 = new(WindowMap)
for i, aWM := range(Data.Windows) {
log.Println(aWM)
if (aWM.W == nil) {
log.Println("ShowWindow() THIS WINDOW IS NOT YET SHOWN")
// Data.NewWindow = &aWM
Data.NewWindow = i
ui.Main(InitWindow)
}
}
}
func InitNewWindow(c *pb.Config, action string) *WindowMap {
log.Println("InitNewWindow() Create a new window") log.Println("InitNewWindow() Create a new window")
var newWindowMap WindowMap var newWindowMap WindowMap
newWindowMap.C = c newWindowMap.C = c
@ -250,13 +237,16 @@ func InitNewWindow(c *pb.Config, action string) *WindowMap {
return true return true
}) })
return &newWindowMap for i, aWM := range(Data.Windows) {
log.Println(aWM)
// NEED TO INIT THIS HERE if (aWM.W == nil) {
// ui.OnShouldQuit(func() bool { log.Println("ShowWindow() THIS WINDOW IS NOT YET SHOWN")
// mouseClick(&newBM) // Data.NewWindow = &aWM
// return true Data.NewWindow = i
// }) ui.Main(InitWindow)
return
}
}
} }
func getSplashText() *ui.AttributedString { func getSplashText() *ui.AttributedString {