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

On Windows, fix invalid hmonitor panic

Browse source 
Co-authored-by: Kirill Chibisov <contact@kchibisov.com>
This commit is contained in:
Xiaopeng Li 2023-10-20 18:51:04 +08:00 • committed by GitHub
parent 41dbbc27a0
commit 52b7205b75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/platform_impl/windows/monitor.rs
View file

@ -209,11 +209,15 @@ impl MonitorHandle {
#[inline] #[inline]
pub fn position(&self) -> PhysicalPosition<i32> { pub fn position(&self) -> PhysicalPosition<i32> {
let rc_monitor = get_monitor_info(self.0).unwrap().monitorInfo.rcMonitor; get_monitor_info(self.0)
.map(|info| {
let rc_monitor = info.monitorInfo.rcMonitor;
PhysicalPosition { PhysicalPosition {
x: rc_monitor.left, x: rc_monitor.left,
y: rc_monitor.top, y: rc_monitor.top,
} }
})
.unwrap_or(PhysicalPosition { x: 0, y: 0 })
} }
#[inline] #[inline]