Make CGFloat invisible to outside crates

gfx-rs · Aug 1, 2023 · 7cebd0c · 7cebd0c
1 parent 7f191d1
commit 7cebd0c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/examples/raytracing/renderer.rs b/examples/raytracing/renderer.rs
@@ -265,7 +265,7 @@ impl Renderer {
             frame_index: 0,
             uniform_buffer_index: 0,
             uniform_buffer_offset: 0,
-            size: CGSize::new(1024 as CGFloat, 1024 as CGFloat),
+            size: CGSize::new(1024.0, 1024.0),
             semaphore: Semaphore::new((MAX_FRAMES_IN_FLIGHT - 2) as usize),
             instance_buffer,
             queue,

diff --git a/src/lib.rs b/src/lib.rs
@@ -29,8 +29,8 @@ use std::{
 };
 
 use foreign_types::ForeignType;
-pub(crate) use icrate::Foundation::NSRange;
-pub use icrate::Foundation::{CGFloat, NSSize as CGSize};
+pub use icrate::Foundation::NSSize as CGSize;
+pub(crate) use icrate::Foundation::{CGFloat, NSRange};
 pub(crate) use objc2::encode::{Encode, Encoding, RefEncode};
 use objc2::runtime::{AnyObject, Bool, Protocol};
 
@@ -498,11 +498,13 @@ impl MetalLayerRef {
         unsafe { msg_send![self, nextDrawable] }
     }
 
-    pub fn contents_scale(&self) -> CGFloat {
-        unsafe { msg_send![self, contentsScale] }
+    pub fn contents_scale(&self) -> f64 {
+        let res: CGFloat = unsafe { msg_send![self, contentsScale] };
+        res as f64
     }
 
-    pub fn set_contents_scale(&self, scale: CGFloat) {
+    pub fn set_contents_scale(&self, scale: f64) {
+        let scale = scale as CGFloat;
         unsafe { msg_send![self, setContentsScale: scale] }
     }