Merge branch 'web' into merge-master-to-web

This commit is contained in:
Ryan Goldstein 2019-09-24 19:41:59 -04:00
commit 86bafdc104
10 changed files with 61 additions and 19 deletions

View file

@ -10,19 +10,21 @@ impl Handle {
}
pub fn position(&self) -> PhysicalPosition {
unimplemented!();
PhysicalPosition { x: 0.0, y: 0.0 }
}
pub fn name(&self) -> Option<String> {
unimplemented!();
None
}
pub fn size(&self) -> PhysicalSize {
unimplemented!();
PhysicalSize {
width: 0.0,
height: 0.0,
}
}
pub fn video_modes(&self) -> impl Iterator<Item = VideoMode> {
// TODO: is this possible ?
std::iter::empty()
}
}
@ -45,9 +47,6 @@ impl Mode {
}
pub fn monitor(&self) -> MonitorHandle {
MonitorHandle {
inner: Handle
}
MonitorHandle { inner: Handle }
}
}