diff options
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXWindowEvent.c | 25 | ||||
| -rw-r--r-- | macosx/tkMacOSXWm.c | 20 |
2 files changed, 22 insertions, 23 deletions
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index d9075f7..09112ee 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -239,8 +239,8 @@ extern NSString *NSWindowDidOrderOffScreenNotification; if (winPtr) { TKContentView *view = [window contentView]; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101500 - if (@available(macOS 10.15, *)) { +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400 + if (@available(macOS 10.14, *)) { [view viewDidChangeEffectiveAppearance]; } #endif @@ -1237,29 +1237,8 @@ static const char *const accentNames[] = { } else if (effectiveAppearanceName == NSAppearanceNameDarkAqua) { TkSendVirtualEvent(tkwin, "DarkAqua", NULL); } - if ([NSApp macOSVersion] < 101500) { - - /* - * Mojave cannot handle the KVO shenanigans that we need for the - * highlight and accent color notifications. - */ - - return; - } if (!defaultColor) { defaultColor = [NSApp macOSVersion] < 110000 ? "Blue" : "Multicolor"; - preferences = [[NSUserDefaults standardUserDefaults] retain]; - - /* - * AppKit calls this method when the user changes the Accent Color - * but not when the user changes the Highlight Color. So we register - * to receive KVO notifications for Highlight Color as well. - */ - - [preferences addObserver:self - forKeyPath:@"AppleHighlightColor" - options:NSKeyValueObservingOptionNew - context:NULL]; } NSString *accent = [preferences stringForKey:@"AppleAccentColor"]; NSArray *words = [[preferences stringForKey:@"AppleHighlightColor"] diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index e078938..0adfe4b 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -1086,6 +1086,11 @@ TkWmDeadWindow( [NSApp _setMainWindow:nil]; } [deadNSWindow close]; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400 + NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults]; + [preferences removeObserver:deadNSWindow.contentView + forKeyPath:@"AppleHighlightColor"]; +#endif [deadNSWindow release]; #if DEBUG_ZOMBIES > 1 @@ -6217,6 +6222,21 @@ TkMacOSXMakeRealWindowExist( } TKContentView *contentView = [[TKContentView alloc] initWithFrame:NSZeroRect]; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400 + NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults]; + + /* + * AppKit calls the viewDidChangeEffectiveAppearance method when the + * user changes the Accent Color but not when the user changes the + * Highlight Color. So we register to receive KVO notifications for + * Highlight Color as well. + */ + + [preferences addObserver:contentView + forKeyPath:@"AppleHighlightColor" + options:NSKeyValueObservingOptionNew + context:NULL]; +#endif [window setContentView:contentView]; [contentView release]; [window setDelegate:NSApp]; |