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

Make 'primary_monitor' return 'Option<MonitorHandle>'

Browse Source 
Certain platforms like Wayland don't have a concept of
primary Monitor in particular. To indicate that
'primary_monitor' will return 'None' as well as in cases
where the primary monitor can't be detected.

Fixes #1683.
This commit is contained in:
Kirill Chibisov
2020-09-07 20:20:47 +03:00
committed by GitHub
parent cac627ed05
commit d103dc2631
16 changed files with 86 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/platform_impl/linux/wayland/event_loop.rs
View File

@@ -648,8 +648,9 @@ impl<T> EventLoopWindowTarget<T> {
available_monitors(&self.outputs)
}
pub fn primary_monitor(&self) -> MonitorHandle {
primary_monitor(&self.outputs)
pub fn primary_monitor(&self) -> Option<RootMonitorHandle> {
// Wayland doesn't have a notion of primary monitor.
None
}
}
@@ -1121,19 +1122,6 @@ impl MonitorHandle {
}
}
pub fn primary_monitor(outputs: &OutputMgr) -> MonitorHandle {
outputs.with_all(|list| {
if let Some(&(_, ref proxy, _)) = list.first() {
MonitorHandle {
proxy: proxy.clone(),
mgr: outputs.clone(),
}
} else {
panic!("No monitor is available.")
}
})
}
pub fn available_monitors(outputs: &OutputMgr) -> VecDeque<MonitorHandle> {
outputs.with_all(|list| {
list.iter()