alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-24 06:11:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix no primary monitor panic in XWayland (#318)

Browse source 
* Fix no primary monitor panic in XWayland

In this case try to use the first existing monitor instead of panicking.
Fixes #317

* Shift no monitor panic to x11::get_primary_monitor

* Update changelog with xll get_primary_monitor fallback
This commit is contained in:
Alex Butler 2017-10-28 14:24:37 +01:00 committed by Victor Berger
parent 36058ab8e6
commit b3c5ee6219
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -13,6 +13,7 @@
`EnumDisplayDevices`. This changes the value returned by `MonitorId::get_name()`. `EnumDisplayDevices`. This changes the value returned by `MonitorId::get_name()`.
- On Windows added `MonitorIdExt::hmonitor` method - On Windows added `MonitorIdExt::hmonitor` method
- Impl `Clone` for `EventsLoopProxy` - Impl `Clone` for `EventsLoopProxy`
- `EventsLoop::get_primary_monitor()` on X11 will fallback to any available monitor if no primary is found
# Version 0.8.3 (2017-10-11) # Version 0.8.3 (2017-10-11)

11
src/platform/linux/x11/monitor.rs
View file

@ -75,13 +75,10 @@ pub fn get_available_monitors(x: &Arc<XConnection>) -> Vec<MonitorId> {
#[inline] #[inline]
pub fn get_primary_monitor(x: &Arc<XConnection>) -> MonitorId { pub fn get_primary_monitor(x: &Arc<XConnection>) -> MonitorId {
for monitor in get_available_monitors(x) { get_available_monitors(x).into_iter().find(|m| m.primary)
if monitor.primary { // 'no primary' case is better handled picking some existing monitor
return monitor.clone() .or_else(|| get_available_monitors(x).into_iter().next())
} .expect("[winit] Failed to find any x11 monitor")
}
panic!("[winit] Failed to find the primary monitor")
} }
impl MonitorId { impl MonitorId {