alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2025-01-23 10:26:34 +11:00
Code Issues Projects Releases Packages Wiki Activity

Remove incorrect unreachable usage when guessing DPI factor (#592)

Browse source
This commit is contained in:
Francesca Frangipane 2018-07-05 11:52:25 -04:00 • committed by GitHub
parent ec393e4a90
commit 040d3f5d8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,6 +1,7 @@
# Unreleased # Unreleased
- On Windows, non-resizable windows now have the maximization button disabled. This is consistent with behavior on macOS and popular X11 WMs. - On Windows, non-resizable windows now have the maximization button disabled. This is consistent with behavior on macOS and popular X11 WMs.
- Corrected incorrect `unreachable!` usage when guessing the DPI factor with no detected monitors.
# Version 0.16.1 (2018-07-02) # Version 0.16.1 (2018-07-02)

2
src/platform/linux/x11/window.rs
View file

@ -102,7 +102,7 @@ impl UnownedWindow {
.unwrap_or(1.0) .unwrap_or(1.0)
}) })
} else { } else {
unreachable!("There are no detected monitors, which should've already caused a panic."); return Err(OsError(format!("No monitors were detected.")));
}; };
info!("Guessed window DPI factor: {}", dpi_factor); info!("Guessed window DPI factor: {}", dpi_factor);

2
src/platform/windows/window.rs
View file

@ -872,7 +872,7 @@ unsafe fn init(
} }
dpi_factor dpi_factor
} else { } else {
unreachable!("There are no detected monitors, which should've already caused a panic."); return Err(CreationError::OsError(format!("No monitors were detected.")));
}; };
dpi_factor.unwrap_or_else(|| { dpi_factor.unwrap_or_else(|| {
util::get_cursor_pos() util::get_cursor_pos()