wip stuff

Author: prokopyl

src/dpi.rs

@@ -4,106 +4,13 @@ pub use dpi::*;
 /// A size represented in the platform's native pixels.
 ///
 /// This size is represented in physical pixels on Windows and Linux, and in logical pixels on macOS.
+///
+/// # Platform compatibility notes
+///
+/// On Windows, this *always* represents *actual* pixels, *NOT* the "physical pixels" window
+/// implementations think they are using when using the Win32 APIs. TODO: finish sentence
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub struct NativeSize<P> {
-    pub width: P,
-    pub height: P,
-}
-
-#[cfg(target_os = "macos")]
-const NATIVE_IS_LOGICAL: bool = true;
-#[cfg(not(target_os = "macos"))]
-const NATIVE_IS_LOGICAL: bool = false;
-
-impl<P> NativeSize<P> {
-    #[inline]
-    pub const fn new(width: P, height: P) -> Self {
-        NativeSize { width, height }
-    }
-
-    /// This is `true` if the platform's native size is represented in logical pixels, and `false` otherwise.
-    ///
-    /// This is `true` on macOS, and `false` on Windows and Linux.
-    pub const IS_LOGICAL: bool = NATIVE_IS_LOGICAL;
-}
-
-impl<P: Pixel> NativeSize<P> {
-    #[inline]
-    pub fn from_size(size: Size, scale_factor: f64) -> Self {
-        #[cfg(target_os = "macos")]
-        {
-            let size = size.to_logical(scale_factor);
-            Self { width: size.width, height: size.height }
-        }
-
-        #[cfg(not(target_os = "macos"))]
-        {
-            let size = size.to_physical(scale_factor);
-            Self { width: size.width, height: size.height }
-        }
-    }
-
-    #[inline]
-    pub fn cast<X: Pixel>(&self) -> NativeSize<X> {
-        NativeSize { width: self.width.cast(), height: self.height.cast() }
-    }
-
-    #[inline]
-    pub fn to_physical(self, scale_factor: f64) -> PhysicalSize<P> {
-        #[cfg(target_os = "macos")]
-        {
-            let size = LogicalSize { width: self.width, height: self.height };
-            size.to_physical(scale_factor)
-        }
-        #[cfg(not(target_os = "macos"))]
-        {
-            let _ = scale_factor;
-            PhysicalSize { width: self.width, height: self.height }
-        }
-    }
-
-    #[inline]
-    pub fn to_logical(self, scale_factor: f64) -> LogicalSize<P> {
-        #[cfg(target_os = "macos")]
-        {
-            let _ = scale_factor;
-            LogicalSize { width: self.width, height: self.height }
-        }
-        #[cfg(not(target_os = "macos"))]
-        {
-            let size = PhysicalSize { width: self.width, height: self.height };
-            size.to_logical(scale_factor)
-        }
-    }
-}
-
-impl<P: Pixel> From<WindowSize> for NativeSize<P> {
-    #[inline]
-    fn from(size: WindowSize) -> Self {
-        #[cfg(target_os = "macos")]
-        {
-            let size = size.logical.cast();
-            Self { width: size.width, height: size.height }
-        }
-
-        #[cfg(not(target_os = "macos"))]
-        {
-            let size = size.physical.cast();
-            Self { width: size.width, height: size.height }
-        }
-    }
-}
-
-impl<P: Pixel> From<NativeSize<P>> for Size {
-    #[inline]
-    fn from(size: NativeSize<P>) -> Self {
-        #[cfg(target_os = "macos")]
-        {
-            Size::Logical(LogicalSize::new(size.width, size.height).cast())
-        }
-        #[cfg(not(target_os = "macos"))]
-        {
-            Size::Physical(PhysicalSize::new(size.width, size.height).cast())
-        }
-    }
+pub struct HostSize {
+    pub width: u32,
+    pub height: u32,
 }

src/window.rs

@@ -281,11 +281,6 @@ impl WindowSize {
     pub fn from_logical(logical: LogicalSize<f64>, scale_factor: f64) -> Self {
         Self { physical: logical.to_physical(scale_factor), logical, scale_factor }
     }
-
-    #[inline]
-    pub fn to_native_size<P: Pixel>(&self) -> NativeSize<P> {
-        (*self).into()
-    }
 }
 
 impl<P: Pixel> From<WindowSize> for PhysicalSize<P> {
@@ -304,7 +299,8 @@ impl<P: Pixel> From<WindowSize> for LogicalSize<P> {
 
 impl From<WindowSize> for Size {
     #[inline]
+    #[cfg(not(target_os = "macos"))]
     fn from(value: WindowSize) -> Self {
-        value.to_native_size::<f64>().into()
+        Size::Physical(value.physical)
     }
 }