From 3dde669ee8dd882f0145fd0cf3b5d982525a9b2c Mon Sep 17 00:00:00 2001 From: Sindre Sorhus Date: Tue, 6 Dec 2016 22:48:40 +0100 Subject: [PATCH] :apple: Remove deprecated `dock` window level According to the Apple docs, the `NSDockWindowLevel` constant is deprecated: https://developer.apple.com/reference/appkit/nsdockwindowlevel?language=objc --- atom/browser/native_window_mac.mm | 1 + docs/api/browser-window.md | 2 +- spec/api-browser-window-spec.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm index 6c4212bee922..0da847dc145f 100644 --- a/atom/browser/native_window_mac.mm +++ b/atom/browser/native_window_mac.mm @@ -1073,6 +1073,7 @@ void NativeWindowMac::SetAlwaysOnTop(bool top, const std::string& level) { } else if (level == "screen-saver") { windowLevel = NSScreenSaverWindowLevel; } else if (level == "dock") { + // Deprecated by macOS, but kept for backwards compatibility windowLevel = NSDockWindowLevel; } } diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md index 6cc6aa17df92..67f2b9b1a52a 100644 --- a/docs/api/browser-window.md +++ b/docs/api/browser-window.md @@ -832,7 +832,7 @@ On Linux always returns `true`. * `flag` Boolean * `level` String (optional) _macOS_ - Values include `normal`, `floating`, `torn-off-menu`, `modal-panel`, `main-menu`, `status`, `pop-up-menu`, - `screen-saver`, and `dock`. The default is `floating`. See the + `screen-saver`, and ~~`dock`~~ (Deprecated). The default is `floating`. See the [macOS docs][window-levels] for more details. Sets whether the window should show always on top of other windows. After diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js index 3d2c9f999e70..7678b02af728 100644 --- a/spec/api-browser-window-spec.js +++ b/spec/api-browser-window-spec.js @@ -494,7 +494,7 @@ describe('BrowserWindow module', function () { describe('BrowserWindow.setAlwaysOnTop(flag, level)', function () { it('sets the window as always on top', function () { assert.equal(w.isAlwaysOnTop(), false) - w.setAlwaysOnTop(true, 'dock') + w.setAlwaysOnTop(true, 'screen-saver') assert.equal(w.isAlwaysOnTop(), true) w.setAlwaysOnTop(false) assert.equal(w.isAlwaysOnTop(), false)