Merge branch 'wasm-launchable' into wasm-input

This commit is contained in:
Brooks J Rady 2021-01-07 10:29:29 +00:00
commit fe6cb365f7

View file

@ -16,8 +16,7 @@ pub enum PaneId {
Plugin(u32), // FIXME: Drop the trait object, make this a wrapper for the struct? Plugin(u32), // FIXME: Drop the trait object, make this a wrapper for the struct?
BuiltIn(u32), BuiltIn(u32),
} }
#[derive(Clone, Copy, Debug, Default)]
#[derive(Clone, Copy, Debug)]
pub struct PositionAndSize { pub struct PositionAndSize {
pub x: usize, pub x: usize,
pub y: usize, pub y: usize,
@ -25,13 +24,12 @@ pub struct PositionAndSize {
pub columns: usize, pub columns: usize,
} }
impl PositionAndSize { impl From<Winsize> for PositionAndSize {
pub fn from(winsize: Winsize) -> PositionAndSize { fn from(winsize: Winsize) -> PositionAndSize {
PositionAndSize { PositionAndSize {
columns: winsize.ws_col as usize, columns: winsize.ws_col as usize,
rows: winsize.ws_row as usize, rows: winsize.ws_row as usize,
x: winsize.ws_xpixel as usize, ..Default::default()
y: winsize.ws_ypixel as usize,
} }
} }
} }