all local variables are in Data{}

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

1 files changed, 2 insertions, 29 deletions

diff --git a/splash.go b/splash.go
index 5891da9..17b460f 100644
--- a/splash.go
+++ b/splash.go
@@ -10,41 +10,14 @@ import "runtime"
 import "github.com/andlabs/ui"
 import _ "github.com/andlabs/ui/winmanifest"
 
-var MyArea	*ui.Area
-
-func ShowSplash() *ui.Window {
-	splashWin := ui.NewWindow("", 640, 480, true)
-	splashWin.SetBorderless(true)
-	splashWin.OnClosing(func(*ui.Window) bool {
-		ui.Quit()
-		return true
-	})
-	ui.OnShouldQuit(func() bool {
-		splashWin.Destroy()
-		return true
-	})
-
-	vbox := ui.NewVerticalBox()
-	vbox.SetPadded(true)
-	splashWin.SetChild(vbox)
-	splashWin.SetMargined(true)
-
-	// This displays the window
-	// splashWin.Show()
-
-	ShowSplashBox(vbox, nil, nil)
-
-	return splashWin
-}
-
 func ShowSplashBox(vbox *ui.Box, atest chan int, custom func(int, string)) *ui.Box {
 	newbox := ui.NewVerticalBox()
 	newbox.SetPadded(true)
 
 	makeAttributedString()
-	MyArea = makeSplashArea(custom)
+	Data.MyArea = makeSplashArea(custom)
 
-	newbox.Append(MyArea, true)
+	newbox.Append(Data.MyArea, true)
 
 	if runtime.GOOS == "linux" {
 		newbox.Append(ui.NewLabel("OS: Linux"), false)