migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-09-02 06:40:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove From<NSApplicationActivationPolicy> impl from ActivationPolicy (#690)

Browse Source 
* Remove From<NSApplicationActivationPolicy> impl from ActivationPolicy

* Update CHANGELOG
This commit is contained in:
Osspial
2018-11-05 18:54:22 -05:00
committed by Francesca Plebani
parent d2d127a4c4
commit 52e2748869
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/os/macos.rs
View File

@@ -1,8 +1,6 @@
#![cfg(target_os = "macos")]
use std::convert::From;
use std::os::raw::c_void;
use cocoa::appkit::NSApplicationActivationPolicy;
use {LogicalSize, MonitorId, Window, WindowBuilder};
/// Additional methods on `Window` that are specific to MacOS.
@@ -47,19 +45,6 @@ impl Default for ActivationPolicy {
}
}
impl From<ActivationPolicy> for NSApplicationActivationPolicy {
fn from(activation_policy: ActivationPolicy) -> Self {
match activation_policy {
ActivationPolicy::Regular =>
NSApplicationActivationPolicy::NSApplicationActivationPolicyRegular,
ActivationPolicy::Accessory =>
NSApplicationActivationPolicy::NSApplicationActivationPolicyAccessory,
ActivationPolicy::Prohibited =>
NSApplicationActivationPolicy::NSApplicationActivationPolicyProhibited,
}
}
}
/// Additional methods on `WindowBuilder` that are specific to MacOS.
///
/// **Note:** Properties dealing with the titlebar will be overwritten by the `with_decorations` method