Merge pull request #118 from Mike-Woolley/master

Fixed build error using Xcode 12 and Menu Bar formatting on Big Sur.
This commit is contained in:
Hendrik Holtmann
2021-05-17 19:45:15 +02:00
committed by GitHub
2 changed files with 3 additions and 1 deletions

View File

@ -447,6 +447,8 @@ NSUserDefaults *defaults;
[paragraphStyle setAlignment:NSLeftTextAlignment]; [paragraphStyle setAlignment:NSLeftTextAlignment];
[s_status addAttribute:NSFontAttributeName value:[NSFont fontWithName:@"Lucida Grande" size:fsize] range:NSMakeRange(0,[s_status length])]; [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])]; [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])]; if (setColor) [s_status addAttribute:NSForegroundColorAttributeName value:menuColor range:NSMakeRange(0,[s_status length])];

View File

@ -98,7 +98,7 @@ typedef struct {
typedef unsigned char SMCBytes_t[32]; typedef unsigned char SMCBytes_t[32];
UInt8 fannum[] = "0123456789ABCDEFGHIJ"; static UInt8 fannum[] = "0123456789ABCDEFGHIJ";
typedef struct { typedef struct {
UInt32 key; UInt32 key;