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

fix(macos): remove internal From implementation #1048

Merged
merged 1 commit into from
Jan 21, 2025
Merged

fix(macos): remove internal From implementation #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changes/remove-from-activation-policy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
tao: minor
---

macOS: Remove `From<ActivationPolicy>` implementation for `cocoa::appkit::NSApplicationActivationPolicy`.
25 changes: 9 additions & 16 deletions src/platform/macos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ use crate::{
window::{Window, WindowBuilder},
};

use cocoa::appkit::{
NSApplicationActivationPolicy, NSApplicationActivationPolicyAccessory,
NSApplicationActivationPolicyProhibited, NSApplicationActivationPolicyRegular,
};

/// Additional methods on `Window` that are specific to MacOS.
pub trait WindowExtMacOS {
/// Returns a pointer to the cocoa `NSWindow` that is used by this window.
Expand Down Expand Up @@ -189,16 +184,6 @@ impl Default for ActivationPolicy {
}
}

impl From<ActivationPolicy> for NSApplicationActivationPolicy {
fn from(act_pol: ActivationPolicy) -> Self {
match act_pol {
ActivationPolicy::Regular => NSApplicationActivationPolicyRegular,
ActivationPolicy::Accessory => NSApplicationActivationPolicyAccessory,
ActivationPolicy::Prohibited => NSApplicationActivationPolicyProhibited,
}
}
}

/// Additional methods on `WindowBuilder` that are specific to MacOS.
///
/// **Note:** Properties dealing with the titlebar will be overwritten by the `with_decorations` method
Expand Down Expand Up @@ -421,9 +406,17 @@ impl<T> EventLoopWindowTargetExtMacOS for EventLoopWindowTarget<T> {
}

fn set_activation_policy_at_runtime(&self, activation_policy: ActivationPolicy) {
use cocoa::appkit;

let cls = objc::runtime::Class::get("NSApplication").unwrap();
let app: cocoa::base::id = unsafe { msg_send![cls, sharedApplication] };
let ns_activation_policy: NSApplicationActivationPolicy = activation_policy.into();

let ns_activation_policy = match activation_policy {
ActivationPolicy::Regular => appkit::NSApplicationActivationPolicyRegular,
ActivationPolicy::Accessory => appkit::NSApplicationActivationPolicyAccessory,
ActivationPolicy::Prohibited => appkit::NSApplicationActivationPolicyProhibited,
};

unsafe { msg_send![app, setActivationPolicy: ns_activation_policy] }
}

Expand Down
Loading