2.1.2.2, where the CPU temperature in ℉ above 100℉ is correctly taken care of. Fixes #211

yujitach · yujitach · commit 36863fd6cc78 · 2020-12-15T10:45:36.000+09:00
diff --git a/InfoPlistPreprocessor.h b/InfoPlistPreprocessor.h
@@ -9,7 +9,7 @@
 #ifndef InfoPlistPreprocessor_h
 #define InfoPlistPreprocessor_h
 
-#define MM_VERSION  2.1.2.1
+#define MM_VERSION  2.1.2.2
 #define MM_COPYRIGHT MenuMeters MM_VERSION, by many contributors
 
 #endif /* InfoPlistPreprocessor_h */
diff --git a/MenuExtras/MenuMeterCPU/MenuMeterCPUExtra.m b/MenuExtras/MenuMeterCPU/MenuMeterCPUExtra.m
@@ -514,7 +514,11 @@ - (void)renderSingleTemperatureIntoImage:(NSImage *)image atOffset:(float)offset
             }
             break;
         case kCPUTemperatureUnitFahrenheit:
-            temperatureString=[NSString stringWithFormat:@"%.1f℉", fahrenheit];
+            if(fahrenheit>=100){
+                temperatureString=[NSString stringWithFormat:@"%d℉", (int)fahrenheit];
+            }else{
+                temperatureString=[NSString stringWithFormat:@"%.1f℉", fahrenheit];
+            }
             if(celsius<-100){
                 temperatureString=@"??℉";
             }
diff --git a/releases.html b/releases.html
@@ -17,6 +17,10 @@
 </head>
 <body>
 <dl>
+    <dt>2.1.2.2 (Dec/15/2020)</dt>
+    <dd>
+        Fixes a bug in 2.1.2 where the CPU temperature in ℉ didn't show the top digit if it was above 100℉. 
+    </dd>
     <dt>2.1.2.1 (Dec/12/2020)</dt>
     <dd>
         Fixes a bug in 2.1.2 which prevented the net meter to load in some cases.

Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,11 @@ - (void)renderSingleTemperatureIntoImage:(NSImage *)image atOffset:(float)offset`
`514`	`514`	`}`
`515`	`515`	`break;`
`516`	`516`	`case kCPUTemperatureUnitFahrenheit:`
`517`		`- temperatureString=[NSString stringWithFormat:@"%.1f℉", fahrenheit];`
	`517`	`+ if(fahrenheit>=100){`
	`518`	`+ temperatureString=[NSString stringWithFormat:@"%d℉", (int)fahrenheit];`
	`519`	`+ }else{`
	`520`	`+ temperatureString=[NSString stringWithFormat:@"%.1f℉", fahrenheit];`
	`521`	`+ }`
`518`	`522`	`if(celsius<-100){`
`519`	`523`	`temperatureString=@"??℉";`
`520`	`524`	`}`