Patch "feels like" layout (schachmat#134)

Change "feels like" temp display Changing the "feels like" temperature to always be to the right of the true temperature, and to be in parenthesis for both frontends that use it.
hutianli · Feb 11, 2019 · 994e4f1 · 994e4f1
1 parent 415efdf
commit 994e4f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/frontends/ascii-art-table.go b/frontends/ascii-art-table.go
@@ -74,11 +74,7 @@ func (c *aatConfig) formatTemp(cond iface.Cond) string {
 	t := *cond.TempC
 	if cond.FeelsLikeC != nil {
 		fl := *cond.FeelsLikeC
-		if fl < t {
-			return aatPad(fmt.Sprintf("%s – %s %s", color(fl), color(t), u), 15)
-		} else if fl > t {
-			return aatPad(fmt.Sprintf("%s – %s %s", color(t), color(fl), u), 15)
-		}
+		return aatPad(fmt.Sprintf("%s (%s) %s", color(t), color(fl), u), 15)
 	}
 	return aatPad(fmt.Sprintf("%s %s", color(t), u), 15)
 }

diff --git a/frontends/emoji.go b/frontends/emoji.go
@@ -47,11 +47,7 @@ func (c *emojiConfig) formatTemp(cond iface.Cond) string {
 	t := *cond.TempC
 	if cond.FeelsLikeC != nil {
 		fl := *cond.FeelsLikeC
-		if fl < t {
-			return aatPad(fmt.Sprintf("%s – %s %s", color(fl), color(t), u), 12)
-		} else if fl > t {
-			return aatPad(fmt.Sprintf("%s – %s %s", color(t), color(fl), u), 12)
-		}
+		return aatPad(fmt.Sprintf("%s (%s) %s", color(t), color(fl), u), 12)
 	}
 	return aatPad(fmt.Sprintf("%s %s", color(t), u), 12)
 }