yuqei/core-foundation-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicate definitions of CGWindow-related constants and types (#659)

Browse Source
This commit is contained in:
nashaofu
2025-05-27 03:26:39 +08:00
committed by GitHub
parent 7928f6ffc9
commit c97cdc6c46
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-graphics/src/display.rs
+3 -21
View File
@@ -18,36 +18,18 @@ pub use crate::base::{boolean_t, CGError};
pub use crate::geometry::{CGPoint, CGRect, CGSize}; pub use crate::geometry::{CGPoint, CGRect, CGSize};
use crate::image::CGImage; use crate::image::CGImage;
use crate::window::{
kCGNullWindowID, CGWindowID, CGWindowImageOption, CGWindowLevel, CGWindowListOption,
};
use core_foundation::base::{CFRetain, TCFType}; use core_foundation::base::{CFRetain, TCFType};
use core_foundation::string::{CFString, CFStringRef}; use core_foundation::string::{CFString, CFStringRef};
use core_graphics_types::base::kCGErrorSuccess; use core_graphics_types::base::kCGErrorSuccess;
use foreign_types::{foreign_type, ForeignType}; use foreign_types::{foreign_type, ForeignType};
pub type CGDirectDisplayID = u32; pub type CGDirectDisplayID = u32;
pub type CGWindowID = u32;
pub type CGWindowLevel = i32;
pub const kCGNullWindowID: CGWindowID = 0 as CGWindowID;
pub const kCGNullDirectDisplayID: CGDirectDisplayID = 0 as CGDirectDisplayID; pub const kCGNullDirectDisplayID: CGDirectDisplayID = 0 as CGDirectDisplayID;
pub type CGWindowListOption = u32;
pub const kCGWindowListOptionAll: CGWindowListOption = 0;
pub const kCGWindowListOptionOnScreenOnly: CGWindowListOption = 1 << 0;
pub const kCGWindowListOptionOnScreenAboveWindow: CGWindowListOption = 1 << 1;
pub const kCGWindowListOptionOnScreenBelowWindow: CGWindowListOption = 1 << 2;
pub const kCGWindowListOptionIncludingWindow: CGWindowListOption = 1 << 3;
pub const kCGWindowListExcludeDesktopElements: CGWindowListOption = 1 << 4;
pub type CGWindowImageOption = u32;
pub const kCGWindowImageDefault: CGWindowImageOption = 0;
pub const kCGWindowImageBoundsIgnoreFraming: CGWindowImageOption = 1 << 0;
pub const kCGWindowImageShouldBeOpaque: CGWindowImageOption = 1 << 1;
pub const kCGWindowImageOnlyShadows: CGWindowImageOption = 1 << 2;
pub const kCGWindowImageBestResolution: CGWindowImageOption = 1 << 3;
pub const kCGWindowImageNominalResolution: CGWindowImageOption = 1 << 4;
pub const kDisplayModeValidFlag: u32 = 0x00000001; pub const kDisplayModeValidFlag: u32 = 0x00000001;
pub const kDisplayModeSafeFlag: u32 = 0x00000002; pub const kDisplayModeSafeFlag: u32 = 0x00000002;
pub const kDisplayModeDefaultFlag: u32 = 0x00000004; pub const kDisplayModeDefaultFlag: u32 = 0x00000004;
core-graphics/src/window.rs
+4 -2
View File
@@ -20,7 +20,11 @@ use crate::image::CGImage;
use crate::sys; use crate::sys;
pub type CGWindowID = u32; pub type CGWindowID = u32;
pub type CGWindowLevel = i32;
pub const kCGNullWindowID: CGWindowID = 0;
// https://developer.apple.com/documentation/coregraphics/cgwindowsharingtype?language=objc
pub type CGWindowSharingType = u32; pub type CGWindowSharingType = u32;
pub const kCGWindowSharingNone: CGWindowSharingType = 0; pub const kCGWindowSharingNone: CGWindowSharingType = 0;
pub const kCGWindowSharingReadOnly: CGWindowSharingType = 1; pub const kCGWindowSharingReadOnly: CGWindowSharingType = 1;
@@ -48,8 +52,6 @@ pub const kCGWindowImageOnlyShadows: CGWindowImageOption = 1 << 2;
pub const kCGWindowImageBestResolution: CGWindowImageOption = 1 << 3; pub const kCGWindowImageBestResolution: CGWindowImageOption = 1 << 3;
pub const kCGWindowImageNominalResolution: CGWindowImageOption = 1 << 4; pub const kCGWindowImageNominalResolution: CGWindowImageOption = 1 << 4;
pub const kCGNullWindowID: CGWindowID = 0;
pub fn copy_window_info( pub fn copy_window_info(
option: CGWindowListOption, option: CGWindowListOption,
relative_to_window: CGWindowID, relative_to_window: CGWindowID,