mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

feat: allow macOS apps to set activation policies (#21983)

Browse source
This commit is contained in:
Shelley Vohr 2020-02-05 19:12:25 +00:00 • committed by GitHub
parent 3341a2c3b4
commit 303ca10846
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
shell/browser/api/electron_api_app.cc
View file

@ -1459,6 +1459,7 @@ void App::BuildPrototype(v8::Isolate* isolate,
base::BindRepeating(&Browser::UpdateCurrentActivity, browser))
.SetMethod("moveToApplicationsFolder", &App::MoveToApplicationsFolder)
.SetMethod("isInApplicationsFolder", &App::IsInApplicationsFolder)
.SetMethod("setActivationPolicy", &App::SetActivationPolicy)
#endif
.SetMethod("setAboutPanelOptions",
base::BindRepeating(&Browser::SetAboutPanelOptions, browser))

2
shell/browser/api/electron_api_app.h
View file

@ -201,6 +201,8 @@ class App : public ElectronBrowserClient::Delegate,
bool CanBrowserClientUseCustomSiteInstance();
#if defined(OS_MACOSX)
void SetActivationPolicy(gin_helper::ErrorThrower thrower,
const std::string& policy);
bool MoveToApplicationsFolder(gin_helper::ErrorThrower, gin::Arguments* args);
bool IsInApplicationsFolder();
v8::Local<v8::Value> GetDockAPI(v8::Isolate* isolate);

20
shell/browser/api/electron_api_app_mac.mm
View file

@ -2,6 +2,8 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include <string>
#include "base/path_service.h"
#include "shell/browser/api/electron_api_app.h"
#include "shell/browser/electron_paths.h"
@ -32,6 +34,24 @@ void App::SetAppLogsPath(gin_helper::ErrorThrower thrower,
}
}
void App::SetActivationPolicy(gin_helper::ErrorThrower thrower,
const std::string& policy) {
NSApplicationActivationPolicy activation_policy;
if (policy == "accessory") {
activation_policy = NSApplicationActivationPolicyAccessory;
} else if (policy == "prohibited") {
activation_policy = NSApplicationActivationPolicyProhibited;
} else if (policy == "regular") {
activation_policy = NSApplicationActivationPolicyRegular;
} else {
thrower.ThrowError("Invalid activation policy: must be one of 'regular', "
"'accessory', or 'prohibited'");
return;
}
[NSApp setActivationPolicy:activation_policy];
}
} // namespace api
} // namespace electron