Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

macOS: set activation policy by default if app does not have a bundle identifier #3961

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

macOS: set activation policy by default if app does not have a bundle identifier #3961

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4477b5
macOS: set activation policy by default if app does not have a bundle…
nicoburns Oct 23, 2024
0dc8519
Update src/platform_impl/apple/appkit/app_state.rs
nicoburns Oct 23, 2024
c7ea8ce
cargo fmt
nicoburns Oct 23, 2024
a80e019
Merge branch 'master' into default-activation-for-non-bundles
nicoburns Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/platform_impl/apple/appkit/app_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::sync::atomic::{AtomicBool, Ordering as AtomicOrdering};
use std::sync::Arc;
use std::time::Instant;

use objc2_app_kit::{NSApplication, NSApplicationActivationPolicy};
use objc2_app_kit::{NSApplication, NSApplicationActivationPolicy, NSRunningApplication};
use objc2_foundation::{MainThreadMarker, NSNotification};

use super::super::event_handler::EventHandler;
Expand Down Expand Up @@ -117,6 +117,12 @@ impl AppState {
// to allow the package manifest to define behavior via LSUIElement.
if self.activation_policy.is_some() {
app.setActivationPolicy(self.activation_policy.unwrap());
} else {
let is_bundle =
unsafe { NSRunningApplication::currentApplication().bundleIdentifier().is_some() };
if !is_bundle {
Comment on lines +121 to +123
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a comment here, perhaps linking to #3958

app.setActivationPolicy(NSApplicationActivationPolicy::Regular);
}
}

#[allow(deprecated)]
Expand Down
Loading