summaryrefslogtreecommitdiff
path: root/platform/macos/app/AppDelegate.m
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2017-02-21 22:47:15 -0800
committerMinh Nguyễn <mxn@1ec5.org>2017-02-21 22:47:15 -0800
commit2f388d663505255e967597c52656cc076e20d95c (patch)
tree157ec4c96a5d6f7c67367f96b73957870ee78edb /platform/macos/app/AppDelegate.m
parentb512af6a6682bf133d8d580cccb309f671f287f6 (diff)
parentdf6a06bd07bda3207b31d86dd66a7468cc33c440 (diff)
downloadqtlocation-mapboxgl-2f388d663505255e967597c52656cc076e20d95c.tar.gz
Merge branch 'release-ios-v3.4.0' into 1ec5-release-ios-v3.4.2
Diffstat (limited to 'platform/macos/app/AppDelegate.m')
-rw-r--r--platform/macos/app/AppDelegate.m11
1 files changed, 10 insertions, 1 deletions
diff --git a/platform/macos/app/AppDelegate.m b/platform/macos/app/AppDelegate.m
index 5b848cc79b..0d780424f9 100644
--- a/platform/macos/app/AppDelegate.m
+++ b/platform/macos/app/AppDelegate.m
@@ -71,7 +71,7 @@ NSString * const MGLLastMapDebugMaskDefaultsKey = @"MGLLastMapDebugMask";
@end
-@interface AppDelegate ()
+@interface AppDelegate () <NSWindowDelegate>
@property (weak) IBOutlet NSArrayController *offlinePacksArrayController;
@property (weak) IBOutlet NSPanel *offlinePacksPanel;
@@ -294,4 +294,13 @@ NSString * const MGLLastMapDebugMaskDefaultsKey = @"MGLLastMapDebugMask";
return NO;
}
+#pragma mark NSWindowDelegate methods
+
+- (void)windowWillClose:(NSNotification *)notification {
+ NSWindow *window = notification.object;
+ if (window == self.preferencesWindow) {
+ [window makeFirstResponder:nil];
+ }
+}
+
@end