Renamed blocked queue to deferred queue. Improved DPI for windows 8.1…

…. Minor fixes

druid-shell/src/platform/gtk/screen.rs

@@ -18,5 +18,5 @@ use crate::screen::Monitor;
 
 pub(crate) fn get_monitors() -> Vec<Monitor> {
     log::warn!("Screen::get_monitors() is currently unimplemented for gtk.");
-    Vec::<Monitor>::new()
+    Vec::new()
 }

druid-shell/src/platform/gtk/window.rs

@@ -41,15 +41,14 @@ use crate::keyboard::{KbKey, KeyState, KeyEvent, Modifiers};
 use crate::mouse::{Cursor, MouseButton, MouseButtons, MouseEvent};
 use crate::scale::{Scale, Scalable, ScaledArea};
 use crate::window::{IdleToken, Text, TimerToken, WinHandler};
+use crate::window;
 
 use super::application::Application;
 use super::dialog;
 use super::keycodes;
 use super::menu::Menu;
 use super::util;
 
-use crate::window::WindowState as WindowSizeState; // Avoid name conflict.
-
 /// The platform target DPI.
 ///
 /// GTK considers 96 the default value which represents a 1.0 scale factor.
@@ -162,7 +161,7 @@ impl WindowBuilder {
         log::warn!("WindowBuilder::set_position is currently unimplemented for gtk.");
     }
 
-    pub fn set_window_state(&self, _state: WindowSizeState) {
+    pub fn set_window_state(&self, _state: window::WindowState) {
         log::warn!("WindowBuilder::set_window_state is currently unimplemented for gtk.");
     }
 
@@ -581,13 +580,13 @@ impl WindowHandle {
         Size::new(0.0, 0.0)
     }
 
-    pub fn set_window_state(&self, _state: WindowSizeState) {
+    pub fn set_window_state(&self, _state: window::WindowState) {
         log::warn!("WindowHandle::set_window_state is currently unimplemented for gtk.");
     }
 
-    pub fn get_window_state(&self) -> WindowSizeState {
+    pub fn get_window_state(&self) -> window::WindowState {
         log::warn!("WindowHandle::get_window_state is currently unimplemented for gtk.");
-        WindowSizeState::RESTORED
+        window::WindowState::RESTORED
     }
 
     pub fn handle_titlebar(&self, _val: bool) {

druid-shell/src/platform/mac/screen.rs

@@ -18,5 +18,5 @@ use crate::screen::Monitor;
 
 pub(crate) fn get_monitors() -> Vec<Monitor> {
     log::warn!("Screen::get_monitors() is currently unimplemented for Mac.");
-    Vec::<Monitor>::new()
+    Vec::new()
 }

druid-shell/src/platform/mac/window.rs

@@ -56,9 +56,9 @@ use crate::keyboard_types::KeyState;
 use crate::mouse::{Cursor, MouseButton, MouseButtons, MouseEvent};
 use crate::scale::Scale;
 use crate::window::{IdleToken, Text, TimerToken, WinHandler};
+use crate::window;
 use crate::Error;
 
-use crate::window::WindowState as WindowSizeState; // Avoid name conflict.
 
 #[allow(non_upper_case_globals)]
 const NSWindowDidBecomeKeyNotification: &str = "NSWindowDidBecomeKeyNotification";
@@ -153,7 +153,7 @@ impl WindowBuilder {
         log::warn!("WindowBuilder::set_position is currently unimplemented for mac platforms.");
     }
 
-    pub fn set_window_state(&self, _state: WindowSizeState) {
+    pub fn set_window_state(&self, _state: window::WindowState) {
         log::warn!("WindowBuilder::set_window_state is currently unimplemented for mac platforms.");
     }
 
@@ -866,13 +866,13 @@ impl WindowHandle {
         Size::new(0.0, 0.0)
     }
 
-    pub fn set_window_state(&self, _state: WindowSizeState) {
+    pub fn set_window_state(&self, _state: window::WindowState) {
         log::warn!("WindowHandle::set_window_state is currently unimplemented for Mac.");
     }
 
-    pub fn get_window_state(&self) -> WindowSizeState {
+    pub fn get_window_state(&self) -> window::WindowState {
         log::warn!("WindowHandle::get_window_state is currently unimplemented for Mac.");
-        WindowSizeState::RESTORED
+        window::WindowState::RESTORED
     }
 
     pub fn handle_titlebar(&self, _val: bool) {

druid-shell/src/platform/web/screen.rs

@@ -18,5 +18,5 @@ use crate::screen::Monitor;
 
 pub(crate) fn get_monitors() -> Vec<Monitor> {
     log::warn!("Screen::get_monitors() is not implemented for web.");
-    Vec::<Monitor>::new()
+    Vec::new()
 }

druid-shell/src/platform/web/window.rs

@@ -41,8 +41,7 @@ use crate::scale::{Scale, ScaledArea};
 use crate::keyboard::{KbKey, KeyState, Modifiers};
 use crate::mouse::{Cursor, MouseButton, MouseButtons, MouseEvent};
 use crate::window::{IdleToken, Text, TimerToken, WinHandler};
-
-use crate::window::WindowState as WindowSizeState; // Avoid name conflict.
+use crate::window;
 
 // This is a macro instead of a function since KeyboardEvent and MouseEvent has identical functions
 // to query modifier key states.
@@ -351,7 +350,7 @@ impl WindowBuilder {
         // Ignored
     }
 
-    pub fn set_window_state(&self, _state: WindowSizeState) {
+    pub fn set_window_state(&self, _state: window::WindowState) {
         // Ignored
     }
 
@@ -458,13 +457,13 @@ impl WindowHandle {
         Size::new(0.0, 0.0)
     }
 
-    pub fn set_window_state(&self, _state: WindowSizeState) {
+    pub fn set_window_state(&self, _state: window::WindowState) {
         log::warn!("WindowHandle::set_window_state unimplemented for web.");
     }
 
-    pub fn get_window_state(&self) -> WindowSizeState {
+    pub fn get_window_state(&self) -> window::WindowState {
         log::warn!("WindowHandle::get_window_state unimplemented for web.");
-        WindowSizeState::RESTORED
+        window::WindowState::RESTORED
     }
 
     pub fn handle_titlebar(&self, _val: bool) {

druid-shell/src/platform/windows/application.rs

@@ -25,6 +25,7 @@ use winapi::shared::ntdef::LPCWSTR;
 use winapi::shared::windef::{HCURSOR, HWND, DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2};
 use winapi::shared::winerror::HRESULT_FROM_WIN32;
 use winapi::um::errhandlingapi::GetLastError;
+use winapi::um::shellscalingapi::PROCESS_PER_MONITOR_DPI_AWARE;
 use winapi::um::winuser::{
     DispatchMessageW, GetAncestor, GetMessageW, LoadIconW, PostMessageW, PostQuitMessage,
     RegisterClassW, TranslateAcceleratorW, TranslateMessage, GA_ROOT, IDI_APPLICATION, MSG,
@@ -37,7 +38,7 @@ use super::accels;
 use super::clipboard::Clipboard;
 use super::error::Error;
 use super::util::{self, ToWide, CLASS_NAME, OPTIONAL_FUNCTIONS};
-use super::window::{self, DS_REQUEST_DESTROY, DS_HANDLE_DROPPED};
+use super::window::{self, DS_REQUEST_DESTROY, DS_HANDLE_DEFERRED};
 
 #[derive(Clone)]
 pub(crate) struct Application {
@@ -49,6 +50,8 @@ struct State {
     windows: HashSet<HWND>,
 }
 
+
+
 impl Application {
     pub fn new() -> Result<Application, Error> {
         Application::init()?;
@@ -69,6 +72,11 @@ impl Application {
                 func(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
             }
         }
+        else if let Some(func) = OPTIONAL_FUNCTIONS.SetProcessDpiAwareness {
+            unsafe {
+                func(PROCESS_PER_MONITOR_DPI_AWARE);
+            }
+        }
         unsafe {
             let class_name = CLASS_NAME.to_wide();
             let icon = LoadIconW(0 as HINSTANCE, IDI_APPLICATION);
@@ -106,7 +114,7 @@ impl Application {
             loop {
                 if let Ok(state) = self.state.try_borrow() {
                     for hwnd in &state.windows {
-                        SendMessageW(*hwnd, DS_HANDLE_DROPPED, 0,0);
+                        SendMessageW(*hwnd, DS_HANDLE_DEFERRED, 0,0);
                     }
                 }
                 let mut msg = mem::MaybeUninit::uninit();

druid-shell/src/platform/windows/screen.rs

@@ -27,8 +27,6 @@ use std::mem::size_of;
 use crate::screen::Monitor;
 use crate::kurbo::Rect;
 
-static mut MONITORS : Vec<Monitor> = Vec::new();
-
 unsafe extern "system" fn monitorenumproc(hmonitor : HMONITOR, _hdc : HDC, _lprect : LPRECT, _lparam : LPARAM) -> BOOL {
     let rect = RECT { left: 0, top: 0, right: 0, bottom: 0};
     let mut info = MONITORINFO { cbSize : size_of::<MONITORINFO>() as u32, rcMonitor : rect, rcWork : rect, dwFlags : 0};
@@ -41,21 +39,21 @@ unsafe extern "system" fn monitorenumproc(hmonitor : HMONITOR, _hdc : HDC, _lpre
     let primary = info.dwFlags == MONITORINFOF_PRIMARY;
     let rect = Rect::new(info.rcMonitor.left as f64, info.rcMonitor.top as f64, info.rcMonitor.right as f64, info.rcMonitor.bottom as f64);
     let work_rect = Rect::new(info.rcWork.left as f64, info.rcWork.top as f64, info.rcWork.right as f64, info.rcWork.bottom as f64);
-    let m = Monitor::new(primary, rect, work_rect);
-    MONITORS.push(m);
+    let monitors = _lparam as *mut Vec::<Monitor>;
+    (*monitors).push(Monitor::new(primary, rect, work_rect));
     TRUE
 }
 
-
 pub(crate) fn get_monitors() -> Vec<Monitor> {
     unsafe {
-        MONITORS = Vec::new();
-        if EnumDisplayMonitors(null_mut(), null_mut(), Some(monitorenumproc), 0) == 0{
+        let monitors = Vec::<Monitor>::new();
+        let ptr = &monitors as *const Vec::<Monitor>;
+        if EnumDisplayMonitors(null_mut(), null_mut(), Some(monitorenumproc), ptr as isize) == 0{
             warn!(
                 "Failed to Enumerate Display Monitors: {}",
                 Error::Hr(HRESULT_FROM_WIN32(GetLastError()))
             );
         };
-        MONITORS.clone()
+        monitors
     }
 }

druid-shell/src/platform/windows/util.rs

@@ -132,6 +132,7 @@ pub(crate) fn recti_to_rect(rect: RECT) -> Rect {
 type GetDpiForSystem = unsafe extern "system" fn() -> UINT;
 type GetDpiForWindow = unsafe extern "system" fn(HWND) -> UINT;
 type SetProcessDpiAwarenessContext = unsafe extern "system" fn(winapi::shared::windef::DPI_AWARENESS_CONTEXT) -> BOOL;
+type GetSystemMetricsForDpi = unsafe extern "system" fn(winapi::ctypes::c_int, UINT) -> winapi::ctypes::c_int;
 // from shcore.dll
 type GetDpiForMonitor = unsafe extern "system" fn(HMONITOR, MONITOR_DPI_TYPE, *mut UINT, *mut UINT);
 type SetProcessDpiAwareness = unsafe extern "system" fn(PROCESS_DPI_AWARENESS) -> HRESULT;
@@ -150,6 +151,7 @@ pub struct OptionalFunctions {
     pub SetProcessDpiAwarenessContext: Option<SetProcessDpiAwarenessContext>,
     pub GetDpiForMonitor: Option<GetDpiForMonitor>,
     pub SetProcessDpiAwareness: Option<SetProcessDpiAwareness>,
+    pub GetSystemMetricsForDpi: Option<GetSystemMetricsForDpi>,
     pub DCompositionCreateDevice2: Option<DCompositionCreateDevice2>,
     pub CreateDXGIFactory2: Option<CreateDXGIFactory2>,
 }
@@ -205,6 +207,7 @@ fn load_optional_functions() -> OptionalFunctions {
     let mut GetDpiForWindow = None;
     let mut SetProcessDpiAwarenessContext = None;
     let mut SetProcessDpiAwareness = None;
+    let mut GetSystemMetricsForDpi = None;
     let mut DCompositionCreateDevice2 = None;
     let mut CreateDXGIFactory2 = None;
 
@@ -221,6 +224,7 @@ fn load_optional_functions() -> OptionalFunctions {
         load_function!(user32, GetDpiForSystem, "10");
         load_function!(user32, GetDpiForWindow, "10");
         load_function!(user32, SetProcessDpiAwarenessContext, "10");
+        load_function!(user32, GetSystemMetricsForDpi, "10");
     }
 
     if !dcomp.is_null() {
@@ -237,6 +241,7 @@ fn load_optional_functions() -> OptionalFunctions {
         SetProcessDpiAwarenessContext,
         GetDpiForMonitor,
         SetProcessDpiAwareness,
+        GetSystemMetricsForDpi,
         DCompositionCreateDevice2,
         CreateDXGIFactory2,
     }