Make size/position types generic over pixel type (#1277)

* Begin implementing DPI generics

* Fix multithreaded example

* Format

* Fix serde test

* hopefully fix most of the errors

* Fix dpi module errors

* More error fixings

* Format

* fix macos errors

* Another error pass

* Replace bad type signatures

* more fixins

src/platform_impl/web/monitor.rs

@@ -9,7 +9,7 @@ impl Handle {
         1.0
     }
 
-    pub fn position(&self) -> PhysicalPosition {
+    pub fn position(&self) -> PhysicalPosition<i32> {
         PhysicalPosition { x: 0.0, y: 0.0 }
     }
 
@@ -17,7 +17,7 @@ impl Handle {
         None
     }
 
-    pub fn size(&self) -> PhysicalSize {
+    pub fn size(&self) -> PhysicalSize<u32> {
         PhysicalSize {
             width: 0.0,
             height: 0.0,
@@ -33,7 +33,7 @@ impl Handle {
 pub struct Mode;
 
 impl Mode {
-    pub fn size(&self) -> PhysicalSize {
+    pub fn size(&self) -> PhysicalSize<u32> {
         unimplemented!();
     }
 

src/platform_impl/web/stdweb/canvas.rs

@@ -96,7 +96,7 @@ impl Canvas {
         self.raw.height() as f64
     }
 
-    pub fn set_size(&self, size: LogicalSize) {
+    pub fn set_size(&self, size: LogicalSize<f64>) {
         self.raw.set_width(size.width as u32);
         self.raw.set_height(size.height as u32);
     }

src/platform_impl/web/stdweb/event.rs

@@ -23,7 +23,7 @@ pub fn mouse_modifiers(event: &impl IMouseEvent) -> ModifiersState {
     m
 }
 
-pub fn mouse_position(event: &impl IMouseEvent) -> LogicalPosition {
+pub fn mouse_position(event: &impl IMouseEvent) -> LogicalPosition<f64> {
     LogicalPosition {
         x: event.offset_x() as f64,
         y: event.offset_y() as f64,

src/platform_impl/web/stdweb/mod.rs

@@ -33,7 +33,7 @@ impl WindowExtStdweb for Window {
     }
 }
 
-pub fn window_size() -> LogicalSize {
+pub fn window_size() -> LogicalSize<f64> {
     let window = window();
     let width = window.inner_width() as f64;
     let height = window.inner_height() as f64;

src/platform_impl/web/web_sys/canvas.rs

@@ -94,7 +94,7 @@ impl Canvas {
         self.raw.height() as f64
     }
 
-    pub fn set_size(&self, size: LogicalSize) {
+    pub fn set_size(&self, size: LogicalSize<f64>) {
         self.raw.set_width(size.width as u32);
         self.raw.set_height(size.height as u32);
     }

src/platform_impl/web/web_sys/event.rs

@@ -22,7 +22,7 @@ pub fn mouse_modifiers(event: &MouseEvent) -> ModifiersState {
     m
 }
 
-pub fn mouse_position(event: &MouseEvent) -> LogicalPosition {
+pub fn mouse_position(event: &MouseEvent) -> LogicalPosition<f64> {
     LogicalPosition {
         x: event.offset_x() as f64,
         y: event.offset_y() as f64,

src/platform_impl/web/web_sys/mod.rs

@@ -40,7 +40,7 @@ impl WindowExtWebSys for Window {
     }
 }
 
-pub fn window_size() -> LogicalSize {
+pub fn window_size() -> LogicalSize<f64> {
     let window = web_sys::window().expect("Failed to obtain window");
     let width = window
         .inner_width()

src/platform_impl/web/window.rs

@@ -15,7 +15,7 @@ use std::collections::VecDeque;
 pub struct Window {
     canvas: backend::Canvas,
     previous_pointer: RefCell<&'static str>,
-    position: RefCell<LogicalPosition>,
+    position: RefCell<LogicalPosition<f64>>,
     id: Id,
     register_redraw_request: Box<dyn Fn()>,
 }
@@ -72,17 +72,17 @@ impl Window {
         (self.register_redraw_request)();
     }
 
-    pub fn outer_position(&self) -> Result<LogicalPosition, NotSupportedError> {
+    pub fn outer_position(&self) -> Result<LogicalPosition<f64>, NotSupportedError> {
         let (x, y) = self.canvas.position();
 
         Ok(LogicalPosition { x, y })
     }
 
-    pub fn inner_position(&self) -> Result<LogicalPosition, NotSupportedError> {
+    pub fn inner_position(&self) -> Result<LogicalPosition<f64>, NotSupportedError> {
         Ok(*self.position.borrow())
     }
 
-    pub fn set_outer_position(&self, position: LogicalPosition) {
+    pub fn set_outer_position(&self, position: LogicalPosition<f64>) {
         *self.position.borrow_mut() = position;
 
         self.canvas.set_attribute("position", "fixed");
@@ -91,7 +91,7 @@ impl Window {
     }
 
     #[inline]
-    pub fn inner_size(&self) -> LogicalSize {
+    pub fn inner_size(&self) -> LogicalSize<f64> {
         LogicalSize {
             width: self.canvas.width() as f64,
             height: self.canvas.height() as f64,
@@ -99,7 +99,7 @@ impl Window {
     }
 
     #[inline]
-    pub fn outer_size(&self) -> LogicalSize {
+    pub fn outer_size(&self) -> LogicalSize<f64> {
         LogicalSize {
             width: self.canvas.width() as f64,
             height: self.canvas.height() as f64,
@@ -107,17 +107,17 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_inner_size(&self, size: LogicalSize) {
+    pub fn set_inner_size(&self, size: LogicalSize<f64>) {
         self.canvas.set_size(size);
     }
 
     #[inline]
-    pub fn set_min_inner_size(&self, _dimensions: Option<LogicalSize>) {
+    pub fn set_min_inner_size(&self, _dimensions: Option<LogicalSize<f64>>) {
         // Intentionally a no-op: users can't resize canvas elements
     }
 
     #[inline]
-    pub fn set_max_inner_size(&self, _dimensions: Option<LogicalSize>) {
+    pub fn set_max_inner_size(&self, _dimensions: Option<LogicalSize<f64>>) {
         // Intentionally a no-op: users can't resize canvas elements
     }
 
@@ -178,7 +178,10 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_cursor_position(&self, _position: LogicalPosition) -> Result<(), ExternalError> {
+    pub fn set_cursor_position(
+        &self,
+        _position: LogicalPosition<f64>,
+    ) -> Result<(), ExternalError> {
         // Intentionally a no-op, as the web does not support setting cursor positions
         Ok(())
     }
@@ -243,7 +246,7 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_ime_position(&self, _position: LogicalPosition) {
+    pub fn set_ime_position(&self, _position: LogicalPosition<f64>) {
         // Currently a no-op as it does not seem there is good support for this on web
     }