From 89868c169c75a57c29160dd3773588ab040ac4ae Mon Sep 17 00:00:00 2001
From: Chris Cummer <chris.cummer@lendesk.com>
Date: Fri, 29 Jun 2018 15:24:34 -0700
Subject: [PATCH] New and improved multicalendar display format

---
 gcal/display.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/gcal/display.go b/gcal/display.go
index a193291a..838da89a 100644
--- a/gcal/display.go
+++ b/gcal/display.go
@@ -53,18 +53,22 @@ func (widget *Widget) contentFrom(calEvents []*CalEvent) string {
 		)
 
 		lineOne := fmt.Sprintf(
-			"%s %s %s %s %s[white]",
+			"%s %s %s %s[white]\n",
 			widget.dayDivider(calEvent, prevEvent),
 			widget.responseIcon(calEvent),
 			timestamp,
 			title,
+		)
+
+		str = str + fmt.Sprintf("%s   %s%s\n",
+			lineOne,
+			widget.location(calEvent),
 			widget.timeUntil(calEvent),
 		)
 
-		str = str + fmt.Sprintf("%s%s\n\n",
-			lineOne,
-			widget.location(calEvent),
-		)
+		if (widget.location(calEvent) != "") || (widget.timeUntil(calEvent) != "") {
+			str = str + "\n"
+		}
 
 		prevEvent = calEvent
 	}
@@ -80,11 +84,9 @@ func (widget *Widget) dayDivider(event, prevEvent *CalEvent) string {
 	}
 
 	if event.Start().Day() != prevStartTime.Day() {
-		//_, _, width, _ := widget.View.GetInnerRect()
 
 		return fmt.Sprintf("[%s::b]",
 			wtf.Config.UString("wtf.mods.gcal.colors.day", "forestgreen")) +
-			//wtf.CenterText(event.Start().Format(wtf.FullDateFormat), width) +
 			event.Start().Format(wtf.FullDateFormat) +
 			"\n"
 	}
@@ -185,7 +187,7 @@ func (widget *Widget) location(calEvent *CalEvent) string {
 	}
 
 	return fmt.Sprintf(
-		"\n   [%s]%s",
+		"[%s]%s ",
 		widget.descriptionColor(calEvent),
 		calEvent.event.Location,
 	)