Remove some magic numbers.

HackPlan · Feb 3, 2015 · d300bdb · d300bdb
1 parent 3be76bd
commit d300bdb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/quark-shell/QSHStatusItemView.h b/quark-shell/QSHStatusItemView.h
@@ -10,6 +10,8 @@
 
 @interface QSHStatusItemView : NSButton
 
+#define MENUBAR_FONT [NSFont menuBarFontOfSize:14.0]
+
 @property (nonatomic, weak) NSStatusItem *statusItem;
 @property (nonatomic) BOOL itemHighlighted; // differentiate from NSControl’s highlighted
 @property (nonatomic) NSImage *icon;

diff --git a/quark-shell/QSHStatusItemView.m b/quark-shell/QSHStatusItemView.m
@@ -60,7 +60,7 @@ - (void)drawRect:(NSRect)dirtyRect
         iconFrame = NSMakeRect(3, yOffset, 20, 20);
         NSColor *color = self.itemHighlighted ? [NSColor whiteColor] : [NSColor blackColor];
         NSDictionary *barTextAttributes = @{
-                                            NSFontAttributeName: [NSFont systemFontOfSize:14.0],
+                                            NSFontAttributeName: MENUBAR_FONT,
                                             NSForegroundColorAttributeName: color
                                             };
         [self.label drawInRect:NSMakeRect(25, 2, NSWidth(self.bounds) - 30, 20) withAttributes:barTextAttributes];

diff --git a/quark-shell/QSHWebViewDelegate.m b/quark-shell/QSHWebViewDelegate.m
@@ -216,13 +216,15 @@ - (void)resetMenubarIcon
 
 - (void)changeLabel:(NSString *)label
 {
+    NSDictionary *barTextAttributes;
     if (IS_PERIOR_TO_10_9) {
         self.statusItemView.label = label;
+        barTextAttributes = @{NSFontAttributeName: MENUBAR_FONT};
     }
     else {
         self.statusItem.title = label;
+        barTextAttributes = @{NSFontAttributeName: self.statusItem.button.font};
     }
-    NSDictionary *barTextAttributes = @{NSFontAttributeName: [NSFont systemFontOfSize:14.0]};
     // 20 is image width, 10 is extra margin
     self.statusItem.length = 20 + [label sizeWithAttributes:barTextAttributes].width + 10;
 }