rename dpi_factor to scale_factor where appropriate (#1463)

fixes https://github.com/rust-windowing/winit/issues/1457

src/platform_impl/windows/event_loop.rs

@@ -1422,7 +1422,7 @@ unsafe extern "system" fn public_window_callback<T: 'static>(
 
             if window_state.min_size.is_some() || window_state.max_size.is_some() {
                 if let Some(min_size) = window_state.min_size {
-                    let min_size = min_size.to_physical(window_state.dpi_factor);
+                    let min_size = min_size.to_physical(window_state.scale_factor);
                     let (width, height): (u32, u32) = util::adjust_size(window, min_size).into();
                     (*mmi).ptMinTrackSize = POINT {
                         x: width as i32,
@@ -1430,7 +1430,7 @@ unsafe extern "system" fn public_window_callback<T: 'static>(
                     };
                 }
                 if let Some(max_size) = window_state.max_size {
-                    let max_size = max_size.to_physical(window_state.dpi_factor);
+                    let max_size = max_size.to_physical(window_state.scale_factor);
                     let (width, height): (u32, u32) = util::adjust_size(window, max_size).into();
                     (*mmi).ptMaxTrackSize = POINT {
                         x: width as i32,
@@ -1452,15 +1452,15 @@ unsafe extern "system" fn public_window_callback<T: 'static>(
             // application since they are the same".
             // https://msdn.microsoft.com/en-us/library/windows/desktop/dn312083(v=vs.85).aspx
             let new_dpi_x = u32::from(LOWORD(wparam as DWORD));
-            let new_dpi_factor = dpi_to_scale_factor(new_dpi_x);
-            let old_dpi_factor: f64;
+            let new_scale_factor = dpi_to_scale_factor(new_dpi_x);
+            let old_scale_factor: f64;
 
             let allow_resize = {
                 let mut window_state = subclass_input.window_state.lock();
-                old_dpi_factor = window_state.dpi_factor;
-                window_state.dpi_factor = new_dpi_factor;
+                old_scale_factor = window_state.scale_factor;
+                window_state.scale_factor = new_scale_factor;
 
-                if new_dpi_factor == old_dpi_factor {
+                if new_scale_factor == old_scale_factor {
                     return 0;
                 }
 
@@ -1516,15 +1516,15 @@ unsafe extern "system" fn public_window_callback<T: 'static>(
                 // We calculate our own size because the default suggested rect doesn't do a great job
                 // of preserving the window's logical size.
                 true => old_physical_inner_size
-                    .to_logical::<f64>(old_dpi_factor)
-                    .to_physical::<u32>(new_dpi_factor),
+                    .to_logical::<f64>(old_scale_factor)
+                    .to_physical::<u32>(new_scale_factor),
                 false => old_physical_inner_size,
             };
 
             let _ = subclass_input.send_event(Event::WindowEvent {
                 window_id: RootWindowId(WindowId(window)),
                 event: ScaleFactorChanged {
-                    scale_factor: new_dpi_factor,
+                    scale_factor: new_scale_factor,
                     new_inner_size: &mut new_physical_inner_size,
                 },
             });

src/platform_impl/windows/window.rs

@@ -217,8 +217,8 @@ impl Window {
 
     #[inline]
     pub fn set_inner_size(&self, size: Size) {
-        let dpi_factor = self.scale_factor();
-        let (width, height) = size.to_physical::<u32>(dpi_factor).into();
+        let scale_factor = self.scale_factor();
+        let (width, height) = size.to_physical::<u32>(scale_factor).into();
 
         let window_state = Arc::clone(&self.window_state);
         let window = self.window.clone();
@@ -325,13 +325,13 @@ impl Window {
 
     #[inline]
     pub fn scale_factor(&self) -> f64 {
-        self.window_state.lock().dpi_factor
+        self.window_state.lock().scale_factor
     }
 
     #[inline]
     pub fn set_cursor_position(&self, position: Position) -> Result<(), ExternalError> {
-        let dpi_factor = self.scale_factor();
-        let (x, y) = position.to_physical::<i32>(dpi_factor).into();
+        let scale_factor = self.scale_factor();
+        let (x, y) = position.to_physical::<i32>(scale_factor).into();
 
         let mut point = POINT { x, y };
         unsafe {
@@ -402,7 +402,7 @@ impl Window {
                     let client_rect = util::get_client_rect(window.0).unwrap();
                     window_state_lock.saved_window = Some(SavedWindow {
                         client_rect,
-                        dpi_factor: window_state_lock.dpi_factor,
+                        scale_factor: window_state_lock.scale_factor,
                     });
                 }
                 _ => (),
@@ -513,10 +513,10 @@ impl Window {
                     let mut window_state_lock = window_state.lock();
                     if let Some(SavedWindow {
                         client_rect,
-                        dpi_factor,
+                        scale_factor,
                     }) = window_state_lock.saved_window.take()
                     {
-                        window_state_lock.dpi_factor = dpi_factor;
+                        window_state_lock.scale_factor = scale_factor;
                         drop(window_state_lock);
                         let client_rect = util::adjust_window_rect(window.0, client_rect).unwrap();
 
@@ -712,7 +712,7 @@ unsafe fn init<T: 'static>(
     }
 
     let dpi = hwnd_dpi(real_window.0);
-    let dpi_factor = dpi_to_scale_factor(dpi);
+    let scale_factor = dpi_to_scale_factor(dpi);
 
     // making the window transparent
     if attributes.transparent && !pl_attribs.no_redirection_bitmap {
@@ -758,7 +758,7 @@ unsafe fn init<T: 'static>(
             &attributes,
             window_icon,
             taskbar_icon,
-            dpi_factor,
+            scale_factor,
             dark_mode,
         );
         let window_state = Arc::new(Mutex::new(window_state));

src/platform_impl/windows/window_state.rs

@@ -26,7 +26,7 @@ pub struct WindowState {
     pub taskbar_icon: Option<WinIcon>,
 
     pub saved_window: Option<SavedWindow>,
-    pub dpi_factor: f64,
+    pub scale_factor: f64,
 
     pub fullscreen: Option<Fullscreen>,
     /// Used to supress duplicate redraw attempts when calling `request_redraw` multiple
@@ -40,7 +40,7 @@ pub struct WindowState {
 #[derive(Clone)]
 pub struct SavedWindow {
     pub client_rect: RECT,
-    pub dpi_factor: f64,
+    pub scale_factor: f64,
 }
 
 #[derive(Clone)]
@@ -98,7 +98,7 @@ impl WindowState {
         attributes: &WindowAttributes,
         window_icon: Option<WinIcon>,
         taskbar_icon: Option<WinIcon>,
-        dpi_factor: f64,
+        scale_factor: f64,
         is_dark_mode: bool,
     ) -> WindowState {
         WindowState {
@@ -115,7 +115,7 @@ impl WindowState {
             taskbar_icon,
 
             saved_window: None,
-            dpi_factor,
+            scale_factor,
 
             fullscreen: None,
             queued_out_of_band_redraw: false,