1 files changed, 34 insertions, 23 deletions
diff --git a/colorNew.go b/colorNew.go
index ca333f9..f537c5c 100644
--- a/colorNew.go
+++ b/colorNew.go
@@ -9,7 +9,9 @@ import (
 	"github.com/awesome-gocui/gocui"
 )
 
-func (tk *guiWidget) enableColor() {
+// DONE ON ENABLE() WIDGET
+// restores the last saved color and makes it active
+func (tk *guiWidget) restoreEnableColor() {
 	if tk.color == nil {
 		tk.color = new(colorT)
 	}
@@ -19,10 +21,23 @@ func (tk *guiWidget) enableColor() {
 	tk.color.selFg = tk.colorLast.selFg
 	tk.color.selBg = tk.colorLast.selBg
 
-	tk.updateColor()
+	tk.activateColor()
 }
 
-func (tk *guiWidget) updateColor() {
+// DONE ON DISABLE() WIDGET
+// makes the button look disabled
+func (tk *guiWidget) setColorDisable() {
+	// save the current color
+	tk.color.frame = superLightGrey
+	tk.color.fg = gocui.ColorBlack
+	tk.color.bg = superLightGrey
+	tk.color.selFg = superLightGrey
+	tk.color.selBg = superLightGrey
+	tk.activateColor()
+}
+
+// sets the current gocui highlight colors
+func (tk *guiWidget) activateColor() {
 	if tk.v == nil {
 		return
 	}
@@ -33,6 +48,22 @@ func (tk *guiWidget) updateColor() {
 	tk.v.SelBgColor = tk.color.selBg
 }
 
+// saves the color and makes it active
+func (tk *guiWidget) updateColor() {
+	if tk.v == nil {
+		return
+	}
+	tk.colorLast.frame = tk.color.frame
+	tk.colorLast.fg = tk.color.fg
+	tk.colorLast.bg = tk.color.bg
+	tk.colorLast.selFg = tk.color.selFg
+	tk.colorLast.selBg = tk.color.selBg
+
+	tk.activateColor()
+}
+
+// Below are all the colors. TODO: move to protobuf and save in a config file
+
 func (tk *guiWidget) setColorWindowFrame() {
 	if tk.color == nil {
 		tk.color = new(colorT)
@@ -220,23 +251,3 @@ func (tk *guiWidget) setColorModal() {
 	}
 	tk.updateColor()
 }
-
-// makes the button look disabled
-func (tk *guiWidget) setColorDisable() {
-	// save the current color
-	if tk.color != nil {
-		tk.colorLast.frame = tk.color.frame
-		tk.colorLast.fg = tk.color.fg
-		tk.colorLast.bg = tk.color.bg
-		tk.colorLast.selFg = tk.color.selFg
-		tk.colorLast.selBg = tk.color.selBg
-	} else {
-
-		tk.color.frame = superLightGrey
-		tk.color.fg = gocui.ColorBlack
-		tk.color.bg = superLightGrey
-		tk.color.selFg = superLightGrey
-		tk.color.selBg = superLightGrey
-	}
-	tk.updateColor()
-}