Merge pull request #118 from Mike-Woolley/master

Fixed build error using Xcode 12 and Menu Bar formatting on Big Sur.
hholtmann · May 17, 2021 · 442cc1e · 442cc1e
2 parents 939f865 + 0edcda1
commit 442cc1e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Classes/FanControl.m b/Classes/FanControl.m
@@ -447,6 +447,8 @@ -(void) readFanData:(id)caller{
             [paragraphStyle setAlignment:NSLeftTextAlignment];
             [s_status addAttribute:NSFontAttributeName value:[NSFont fontWithName:@"Lucida Grande" size:fsize] range:NSMakeRange(0,[s_status length])];
             [s_status addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0,[s_status length])];
+            if (menuBarSetting == 0)
+                [s_status addAttribute:NSBaselineOffsetAttributeName value:[NSNumber numberWithFloat: -6] range:NSMakeRange(0, [s_status length])];
 
             if (setColor) [s_status addAttribute:NSForegroundColorAttributeName value:menuColor  range:NSMakeRange(0,[s_status length])];
 

diff --git a/smc-command/smc.h b/smc-command/smc.h
@@ -98,7 +98,7 @@ typedef struct {
 
 typedef unsigned char              SMCBytes_t[32];
 
-UInt8 fannum[] = "0123456789ABCDEFGHIJ";
+static UInt8 fannum[] = "0123456789ABCDEFGHIJ";
 
 typedef struct {
   UInt32                  key;