From 22017fadba68c5a78ee9609cda4dd49f7c4cc21e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alo=C3=AFs=20Micard?= <alois@micard.lu>
Date: Thu, 21 Jan 2021 09:07:49 +0100
Subject: [PATCH] Fix window color

Closes: #16
---
 ctrl.go | 14 +-------------
 main.go |  5 +----
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/ctrl.go b/ctrl.go
index 426ade6..6d5558b 100644
--- a/ctrl.go
+++ b/ctrl.go
@@ -254,13 +254,9 @@ func Quit(g *c.Gui, v *c.View) error {
 func SwitchView(g *c.Gui, v *c.View) error {
 	switch v.Name() {
 	case SITES_VIEW:
-		g.SelFgColor = c.ColorGreen | c.AttrBold
 		if v == SitesList.View {
 			NewsList.Focus(g)
 			SitesList.Unfocus()
-			if strings.Contains(NewsList.Title, "bookmarks") {
-				g.SelFgColor = c.ColorMagenta | c.AttrBold
-			}
 		}
 	case NEWS_VIEW:
 		SitesList.Focus(g)
@@ -386,7 +382,7 @@ func OnEnter(g *c.Gui, v *c.View) error {
 		Summary.Clear()
 		NewsList.Clear()
 		NewsList.Focus(g)
-		g.SelFgColor = c.ColorGreen | c.AttrBold
+
 		NewsList.Title = " Fetching ... "
 		g.Update(func(g *c.Gui) error {
 			events, err := DownloadEvents(site.Url)
@@ -438,7 +434,6 @@ func OnEnter(g *c.Gui, v *c.View) error {
 					return err
 				}
 				deletePromptView(g)
-				g.SelFgColor = c.ColorGreen | c.AttrBold
 				SitesList.Focus(g)
 
 				if err = LoadSites(); err != nil {
@@ -550,7 +545,6 @@ func LoadBookmarks(g *c.Gui, v *c.View) error {
 			return err
 		}
 	}
-	g.SelFgColor = c.ColorMagenta | c.AttrBold
 	return nil
 }
 
@@ -613,11 +607,6 @@ func RemoveTopView(g *c.Gui, v *c.View) error {
 			return err
 		}
 	}
-	if isBookmarksNews() {
-		g.SelFgColor = c.ColorMagenta | c.AttrBold
-	} else {
-		g.SelFgColor = c.ColorGreen | c.AttrBold
-	}
 
 	return nil
 }
@@ -646,7 +635,6 @@ func LoadContent(g *c.Gui, v *c.View) error {
 			log.Println("Error on createContentView", err)
 			return err
 		}
-		g.SelFgColor = c.ColorGreen | c.AttrBold
 		cv, _ := g.View(CONTENT_VIEW)
 		cv.Title = "Fetching..."
 		g.Update(func(g *c.Gui) error {
diff --git a/main.go b/main.go
index 389c48c..68c4cdc 100644
--- a/main.go
+++ b/main.go
@@ -47,7 +47,7 @@ var (
 	CurrentBookmarks []db.Event
 	curW             int
 	curH             int
-	Bold             *color.Color
+	Bold             = color.New(color.Bold)
 )
 
 // relSize calculates the  sizes of the sites view width
@@ -139,12 +139,9 @@ func getAppDir() (string, error) {
 }
 
 func main() {
-
 	var v *c.View
 	var err error
 
-	Bold = color.New(color.Bold)
-
 	appDir, err := getAppDir()
 	if err != nil {
 		panic("Could not set up app directory.")