leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update raw-window-handle to v0.5.0

Browse source 
This updates raw-window-handle to v0.5.0.
This commit is contained in:
Kirill Chibisov 2022-07-21 22:22:36 +03:00 • committed by GitHub
parent 3e991e13dc
commit 653bc59813
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 177 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/platform_impl/windows/event_loop.rs
View file

@ -2,8 +2,6 @@
mod runner;
use once_cell::sync::Lazy;
use parking_lot::Mutex;
use std::{
cell::Cell,
collections::VecDeque,
@ -19,6 +17,10 @@ use std::{
time::{Duration, Instant},
};
use once_cell::sync::Lazy;
use parking_lot::Mutex;
use raw_window_handle::{RawDisplayHandle, WindowsDisplayHandle};
use windows_sys::Win32::{
Devices::HumanInterfaceDevice::MOUSE_MOVE_RELATIVE,
Foundation::{BOOL, HANDLE, HWND, LPARAM, LRESULT, POINT, RECT, WAIT_TIMEOUT, WPARAM},
@ -314,6 +316,10 @@ impl<T> EventLoopWindowTarget<T> {
let monitor = monitor::primary_monitor();
Some(RootMonitorHandle { inner: monitor })
}
pub fn raw_display_handle(&self) -> RawDisplayHandle {
RawDisplayHandle::Windows(WindowsDisplayHandle::empty())
}
}
/// Returns the id of the main thread.

17
src/platform_impl/windows/window.rs
View file

@ -1,7 +1,9 @@
#![cfg(target_os = "windows")]
use parking_lot::Mutex;
use raw_window_handle::{RawWindowHandle, Win32Handle};
use raw_window_handle::{
RawDisplayHandle, RawWindowHandle, Win32WindowHandle, WindowsDisplayHandle,
};
use std::{
cell::Cell,
ffi::c_void,
@ -260,10 +262,15 @@ impl Window {
#[inline]
pub fn raw_window_handle(&self) -> RawWindowHandle {
let mut handle = Win32Handle::empty();
handle.hwnd = self.window.0 as *mut _;
handle.hinstance = self.hinstance() as *mut _;
RawWindowHandle::Win32(handle)
let mut window_handle = Win32WindowHandle::empty();
window_handle.hwnd = self.window.0 as *mut _;
window_handle.hinstance = self.hinstance() as *mut _;
RawWindowHandle::Win32(window_handle)
}
#[inline]
pub fn raw_display_handle(&self) -> RawDisplayHandle {
RawDisplayHandle::Windows(WindowsDisplayHandle::empty())
}
#[inline]