migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-06-27 15:13:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Fix monitors connected via certain Thunderbolt hubs

Browse Source 
Instead of panicking, raise a warning and return `None` or similar.

Co-Authored-By: RJ <rj@metabrew.com>
This commit is contained in:
Mads Marquart
2025-04-29 12:41:42 +02:00
committed by Kirill Chibisov
parent 5f1e9f6cc1
commit 80bddda641
3 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/platform_impl/macos/window_delegate.rs
View File

@@ -1592,8 +1592,14 @@ impl WindowDelegate {
// Allow directly accessing the current monitor internally without unwrapping.
pub(crate) fn current_monitor_inner(&self) -> Option<MonitorHandle> {
let display_id = get_display_id(&*self.window().screen()?);
// Display ID just fetched from live NSScreen, should be fine to unwrap.
Some(MonitorHandle::new(display_id).expect("invalid display ID"))
if let Some(monitor) = MonitorHandle::new(display_id) {
Some(monitor)
} else {
// NOTE: Display ID was just fetched from live NSScreen, but can still result in `None`
// with certain Thunderbolt docked monitors.
warn!(display_id, "got screen with invalid display ID");
None
}
}
#[inline]