Merged in code from existing PR to fix display on BigSur.

hholtmann#110 Also fixed a bug in the PR which broke the "single-line" display option.
Mike-Woolley · Dec 19, 2020 · ad93a2b · ad93a2b
1 parent 1cc993c
commit ad93a2b
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Classes/FanControl.m b/Classes/FanControl.m
@@ -426,12 +426,16 @@ -(void) readFanData:(id)caller{
             s_status=[[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@%@%@",temp,add,fan]];
             paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
             [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: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:NSBaselineOffsetAttributeName
+								 value:[NSNumber numberWithFloat: -6]
+								 range:NSMakeRange(0, s_status.length)];
+				[s_status addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0,[s_status length])];
+			}
             if (setColor) [s_status addAttribute:NSForegroundColorAttributeName value:menuColor  range:NSMakeRange(0,[s_status length])];
 
-
             if ([statusItem respondsToSelector:@selector(button)]) {
                 [statusItem.button setAttributedTitle:s_status];
                 [statusItem.button setImage:nil];