From d9e8321d9e620113a48cf0ea3f36d16a2ce17bb4 Mon Sep 17 00:00:00 2001
From: Didier Korthoudt <didier.korthoudt@icloud.com>
Date: Fri, 9 Oct 2020 13:05:51 +0200
Subject: [PATCH] Fixed: CPButton's now set their font using [self font]
 (#2943)

The corresponding adaptation in CPControl was missing in the previous PR
---
 AppKit/CPControl.j | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j
index 20ccd2f83..623e6003e 100644
--- a/AppKit/CPControl.j
+++ b/AppKit/CPControl.j
@@ -917,7 +917,7 @@ var CPControlBlackColor = [CPColor blackColor];
 */
 - (CPFont)font
 {
-    return [self valueForThemeAttribute:@"font"];
+    return [self currentValueForThemeAttribute:@"font"] || [CPFont systemFontForControlSize:_controlSize];
 }
 
 /*!
@@ -1127,6 +1127,7 @@ var CPControlActionKey                  = @"CPControlActionKey",
         [self setControlSize:[aCoder decodeIntForKey:CPControlControlSizeKey]];
 
         [self setBaseWritingDirection:[aCoder decodeIntForKey:CPControlBaseWrittingDirectionKey]];
+        [self updateTrackingAreas];
     }
 
     return self;