A few fixes

example/ui.go

@@ -92,7 +92,7 @@ func (ui *Ui) run() error {
 
 		case *tcell.EventKey:
 			if ev.Key() == tcell.KeyCtrlC {
-				ui.stop()
+				ui.Exit()
 				return nil
 			}
 			ui.screen.HandleKey(ev)
@@ -115,7 +115,7 @@ func (ui *Ui) SetScreen(scr *UiScreen) {
 	ui.screen.HandleResize(tcell.NewEventResize(ui.GetSize()))
 }
 
-func (ui *Ui) stop()    { ui.running = false }
+func (ui *Ui) Exit()    { ui.running = false }
 func (ui *Ui) cleanup() { ui.tScreen.Fini() }
 
 const letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"

example/ui_screen.go

@@ -30,9 +30,11 @@ type UiScreen struct {
 	ui   *Ui
 	w, h int
 
-	widget w.Widget
-	ll     *w.LinearLayout
-	log    *w.Cli
+	widget      w.Widget
+	ll          *w.LinearLayout
+	log         *w.Cli
+	alert       *w.Alert
+	alertLayout *w.LinearLayout
 
 	widgets []w.Widget
 	cursor  int
@@ -46,88 +48,25 @@ func (s *UiScreen) Init(ui *Ui) {
 	s.ll = w.NewLinearLayout("top", ui.style)
 	s.ll.SetLogger(s.log.Log)
 
-	hl := w.NewLinearLayout("dat", ui.style)
-	hl.SetOrientation(w.LinLayH)
-	hl.SetLogger(s.log.Log)
-
-	searcher := w.NewSearcher("test.searcher", ui.style)
-	searcher.SetLogger(s.log.Log)
-	searcher.SetTitle("Test Searcher")
-	var dat []string
-	for i := 0; i < 1000; i++ {
-		dat = append(dat, RandomString(15))
-	}
-	searcher.SetData(dat)
-	searcher.SetSelectFunc(func(idx int, v string) bool {
-		s.log.Log("Searcher Value Selected: %s", v)
-		return true
-	})
-	searcher.SetH(10)
-	hl.Add(searcher)
-
-	db := w.NewButton("test-bd-1", ui.style)
-	db.SetLabel("Button 1")
-	db.SetOnPressed(func() bool {
-		s.log.Log("Button 1 Pressed")
-		return true
-	})
-	hl.Add(db)
-	db = w.NewButton("test-bd-2", ui.style)
-	db.SetLabel("Button 2")
-	db.SetOnPressed(func() bool {
-		s.log.Log("Button 2 Pressed")
-		return true
-	})
-	hl.Add(db)
-	s.ll.Add(hl)
-
-	btnL := w.NewLinearLayout("test.btnll", ui.style)
-	btnL.SetTabbable(true)
-	btnL.SetLogger(s.log.Log)
-	btnL.SetOrientation(w.LinLayH)
-
-	btnCancel := w.NewButton("btn-cancel", ui.style)
-	btnCancel.SetLabel("Cancel")
-	btnCancel.SetOnPressed(func() bool {
-		s.log.Log("Cancel Pressed")
-		return true
-	})
-	btnL.Add(btnCancel)
-	btnL.AddFlag(btnCancel, w.LFAlignVBottom)
-
-	btnOk := w.NewButton("btn-ok", ui.style)
-	btnOk.SetLabel("Ok")
-	btnOk.SetOnPressed(func() bool {
-		s.log.Log("Ok Pressed")
-		return true
-	})
-	btnL.Add(btnOk)
-	btnL.AddFlag(btnOk, w.LFAlignVBottom)
-	s.ll.Add(btnL)
-	s.ll.AddFlag(btnL, w.LFAlignVBottom)
-
+	tf := w.NewTimeField("time-field", ui.style)
+	tf.SetLabel("Time")
+	s.ll.Add(tf)
 	ml := w.NewTopMenuLayout("menu", ui.style)
 	m := ml.Menu()
 	m.SetLabel("Widget Example")
 	ml.AddMenuItems(
 		m.CreateMenuItem("File", nil,
 			m.CreateMenuItem("Exit", func() bool {
-				s.ui.stop()
+				ui.Exit()
 				return true
 			}),
 		),
 	)
 	ml.SetLogger(s.log.Log)
 	ml.SetWidget(s.ll)
+
 	ml.SetActive(true)
 	s.widget = ml
-	/*
-		dw := w.NewDebugWidget("debug", ui.style)
-		dw.SetWidget(ll)
-		dw.SetSize(w.Coord{X: 20, Y: 30})
-		dw.SetActive(true)
-		s.widget = dw
-	*/
 	s.ll.Add(s.log)
 
 	// s.widgets = append(s.widgets, ml)