diff options
| author | Brooks J Rady <b.j.rady@gmail.com> | 2021-01-07 10:29:29 +0000 |
|---|---|---|
| committer | Brooks J Rady <b.j.rady@gmail.com> | 2021-01-07 10:29:29 +0000 |
| commit | fe6cb365f7caee199dfe9f20e6e1ad02a8bc62b7 (patch) | |
| tree | 0a634a151a8bcb9309071ec5ca7818bcc1dd0b0f /src | |
| parent | Loop through input keys (diff) | |
| parent | Might as well use the From trait (diff) | |
| download | sl0ppij-fe6cb365f7caee199dfe9f20e6e1ad02a8bc62b7.tar.gz sl0ppij-fe6cb365f7caee199dfe9f20e6e1ad02a8bc62b7.tar.xz sl0ppij-fe6cb365f7caee199dfe9f20e6e1ad02a8bc62b7.zip | |
Merge branch 'wasm-launchable' into wasm-input
Diffstat (limited to 'src')
| -rw-r--r-- | src/panes/terminal_pane.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/panes/terminal_pane.rs b/src/panes/terminal_pane.rs index 6bd39a3f..3c5b203a 100644 --- a/src/panes/terminal_pane.rs +++ b/src/panes/terminal_pane.rs @@ -16,8 +16,7 @@ pub enum PaneId { Plugin(u32), // FIXME: Drop the trait object, make this a wrapper for the struct? BuiltIn(u32), } - -#[derive(Clone, Copy, Debug)] +#[derive(Clone, Copy, Debug, Default)] pub struct PositionAndSize { pub x: usize, pub y: usize, @@ -25,13 +24,12 @@ pub struct PositionAndSize { pub columns: usize, } -impl PositionAndSize { - pub fn from(winsize: Winsize) -> PositionAndSize { +impl From<Winsize> for PositionAndSize { + fn from(winsize: Winsize) -> PositionAndSize { PositionAndSize { columns: winsize.ws_col as usize, rows: winsize.ws_row as usize, - x: winsize.ws_xpixel as usize, - y: winsize.ws_ypixel as usize, + ..Default::default() } } } |