diff options
author | Sean E. Russell <ser@ser1.net> | 2020-02-25 14:26:52 -0600 |
---|---|---|
committer | Sean E. Russell <ser@ser1.net> | 2020-02-25 14:26:52 -0600 |
commit | 3641a94ba922336e18e11fc7ee28512489a26dac (patch) | |
tree | 9fbf6a8658c439bcf84b8d9055909267d7c6dabe /widgets | |
parent | 11c33726aa01bf27a6f25e4c13eed0cf382473f5 (diff) | |
parent | 2e96ecb050eac5ec7087644ce91ed1649af5995e (diff) |
Merge remote-tracking branch 'willems/master' into temps
Diffstat (limited to 'widgets')
-rw-r--r-- | widgets/temp.go | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/widgets/temp.go b/widgets/temp.go index f9fec84..ec0292e 100644 --- a/widgets/temp.go +++ b/widgets/temp.go @@ -12,12 +12,11 @@ import ( "github.com/xxxserxxx/gotop/utils" ) -type TempScale int +type TempScale rune const ( - Celsius TempScale = 0 - Fahrenheit = 1 - Disabled = 2 + Celsius TempScale = 'C' + Fahrenheit = 'F' ) type TempWidget struct { @@ -102,22 +101,15 @@ func (self *TempWidget) Draw(buf *ui.Buffer) { ) // TODO: state:merge #184 or #177 degree symbol (BartWillems/master, fleaz/master) - switch self.TempScale { - case Fahrenheit: - buf.SetString( - fmt.Sprintf("%3dF", self.Data[key]), - ui.NewStyle(fg), - image.Pt(self.Inner.Max.X-4, self.Inner.Min.Y+y), - ) - case Celsius: - buf.SetString( - fmt.Sprintf("%3dC", self.Data[key]), - ui.NewStyle(fg), - image.Pt(self.Inner.Max.X-4, self.Inner.Min.Y+y), - ) - } if self.tempsMetric != nil { self.tempsMetric[key].Set(float64(self.Data[key])) } + temperature := fmt.Sprintf("%3d°%c", self.Data[key], self.TempScale) + + buf.SetString( + temperature, + ui.NewStyle(fg), + image.Pt(self.Inner.Max.X-(len(temperature)-1), self.Inner.Min.Y+y), + ) } } |