From 15968718af3b614cf1527fb6e086b0cde9f7d026 Mon Sep 17 00:00:00 2001
From: Chris Cummer <chriscummer@me.com>
Date: Mon, 1 Oct 2018 16:44:51 -0700
Subject: [PATCH] Todo modal shows up much faster now, looks better

---
 todo/widget.go       | 9 ++++++---
 wtf/bargraph.go      | 4 ++--
 wtf/colors.go        | 6 +++---
 wtf/display.go       | 2 +-
 wtf/focus_tracker.go | 4 ++--
 wtf/text_widget.go   | 9 ++++-----
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/todo/widget.go b/todo/widget.go
index c8789b6f..57610fff 100644
--- a/todo/widget.go
+++ b/todo/widget.go
@@ -196,7 +196,7 @@ func (widget *Widget) load() {
 }
 
 func (widget *Widget) newItem() {
-	form := widget.modalForm("New:", "")
+	form := widget.modalForm("New Todo:", "")
 
 	saveFctn := func() {
 		text := form.GetFormItem(0).(*tview.InputField).GetText()
@@ -252,12 +252,15 @@ func (widget *Widget) modalFocus(form *tview.Form) {
 	frame := widget.modalFrame(form)
 	widget.pages.AddPage("modal", frame, false, true)
 	widget.app.SetFocus(frame)
+	widget.app.Draw()
 }
 
 func (widget *Widget) modalForm(lbl, text string) *tview.Form {
 	form := tview.NewForm().
-		SetButtonsAlign(tview.AlignCenter).
-		SetButtonTextColor(tview.Styles.PrimaryTextColor)
+		SetFieldBackgroundColor(wtf.ColorFor(wtf.Config.UString("wtf.colors.background", "black")))
+
+	form.SetButtonsAlign(tview.AlignCenter).
+		SetButtonTextColor(wtf.ColorFor(wtf.Config.UString("wtf.colors.text", "white")))
 
 	form.AddInputField(lbl, text, 60, nil, nil)
 
diff --git a/wtf/bargraph.go b/wtf/bargraph.go
index dcdf8537..c38f9f57 100644
--- a/wtf/bargraph.go
+++ b/wtf/bargraph.go
@@ -97,9 +97,9 @@ func (widget *BarGraph) UpdateRefreshedAt() {
 func (widget *BarGraph) addView() {
 	view := tview.NewTextView()
 
-	view.SetBackgroundColor(colorFor(Config.UString("wtf.colors.background", "black")))
+	view.SetBackgroundColor(ColorFor(Config.UString("wtf.colors.background", "black")))
 	view.SetBorder(true)
-	view.SetBorderColor(colorFor(widget.BorderColor()))
+	view.SetBorderColor(ColorFor(widget.BorderColor()))
 	view.SetDynamicColors(true)
 	view.SetTitle(widget.Name)
 	view.SetWrap(false)
diff --git a/wtf/colors.go b/wtf/colors.go
index 7eb1219c..3f5c0719 100644
--- a/wtf/colors.go
+++ b/wtf/colors.go
@@ -421,9 +421,7 @@ func ASCIItoTviewColors(text string) string {
 				text, replaceWithHexColorString), `[::b]`), `[-]`)
 }
 
-/* -------------------- Unexported Functions -------------------- */
-
-func colorFor(label string) tcell.Color {
+func ColorFor(label string) tcell.Color {
 	if _, ok := colors[label]; ok {
 		return colors[label]
 	}
@@ -431,6 +429,8 @@ func colorFor(label string) tcell.Color {
 	return tcell.ColorGreen
 }
 
+/* -------------------- Unexported Functions -------------------- */
+
 func replaceWithHexColorString(substring string) string {
 	colorID, err := strconv.Atoi(strings.Trim(
 		strings.Split(substring, ";")[2], "m"))
diff --git a/wtf/display.go b/wtf/display.go
index bea5d582..7779cb5b 100644
--- a/wtf/display.go
+++ b/wtf/display.go
@@ -14,7 +14,7 @@ func NewDisplay(widgets []Wtfable) *Display {
 	}
 
 	display.build(widgets)
-	display.Grid.SetBackgroundColor(colorFor(Config.UString("wtf.colors.background", "black")))
+	display.Grid.SetBackgroundColor(ColorFor(Config.UString("wtf.colors.background", "black")))
 
 	return &display
 }
diff --git a/wtf/focus_tracker.go b/wtf/focus_tracker.go
index 7f0495d8..06b1f16c 100644
--- a/wtf/focus_tracker.go
+++ b/wtf/focus_tracker.go
@@ -115,7 +115,7 @@ func (tracker *FocusTracker) blur(idx int) {
 	view := widget.TextView()
 	view.Blur()
 
-	view.SetBorderColor(colorFor(widget.BorderColor()))
+	view.SetBorderColor(ColorFor(widget.BorderColor()))
 }
 
 func (tracker *FocusTracker) decrement() {
@@ -133,7 +133,7 @@ func (tracker *FocusTracker) focus(idx int) {
 	}
 
 	view := widget.TextView()
-	view.SetBorderColor(colorFor(Config.UString("wtf.colors.border.focused", "gray")))
+	view.SetBorderColor(ColorFor(Config.UString("wtf.colors.border.focused", "gray")))
 
 	tracker.App.SetFocus(view)
 	tracker.App.Draw()
diff --git a/wtf/text_widget.go b/wtf/text_widget.go
index 9d4b714d..735a7317 100644
--- a/wtf/text_widget.go
+++ b/wtf/text_widget.go
@@ -96,24 +96,23 @@ func (widget *TextWidget) TextView() *tview.TextView {
 
 /* -------------------- Unexported Functions -------------------- */
 
-
 func (widget *TextWidget) addView(app *tview.Application, configKey string) {
 	view := tview.NewTextView()
 
-	view.SetBackgroundColor(colorFor(
+	view.SetBackgroundColor(ColorFor(
 		Config.UString(fmt.Sprintf("wtf.mods.%s.colors.background", configKey),
 			Config.UString("wtf.colors.background", "black"),
 		),
 	))
 
-	view.SetTextColor(colorFor(
+	view.SetTextColor(ColorFor(
 		Config.UString(
 			fmt.Sprintf("wtf.mods.%s.colors.text", configKey),
 			Config.UString("wtf.colors.text", "white"),
 		),
 	))
 
-	view.SetTitleColor(colorFor(
+	view.SetTitleColor(ColorFor(
 		Config.UString(
 			fmt.Sprintf("wtf.mods.%s.colors.title", configKey),
 			Config.UString("wtf.colors.title", "white"),
@@ -121,7 +120,7 @@ func (widget *TextWidget) addView(app *tview.Application, configKey string) {
 	))
 
 	view.SetBorder(true)
-	view.SetBorderColor(colorFor(widget.BorderColor()))
+	view.SetBorderColor(ColorFor(widget.BorderColor()))
 	view.SetChangedFunc(func() {
 		app.Draw()
 	})