From 7668a19490543a335ce4800eb0dfc55012b2cd79 Mon Sep 17 00:00:00 2001
From: Brooks J Rady <b.j.rady@gmail.com>
Date: Thu, 7 Jan 2021 10:24:29 +0000
Subject: [PATCH 1/2] Fix a positioning bug

---
 src/panes/terminal_pane.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/panes/terminal_pane.rs b/src/panes/terminal_pane.rs
index 6bd39a3f..3d7484aa 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,
@@ -30,8 +29,7 @@ impl 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()
         }
     }
 }

From 2f2143967b8368036822df73c60309966a1d5010 Mon Sep 17 00:00:00 2001
From: Brooks J Rady <b.j.rady@gmail.com>
Date: Thu, 7 Jan 2021 10:26:14 +0000
Subject: [PATCH 2/2] Might as well use the From trait

---
 src/panes/terminal_pane.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panes/terminal_pane.rs b/src/panes/terminal_pane.rs
index 3d7484aa..3c5b203a 100644
--- a/src/panes/terminal_pane.rs
+++ b/src/panes/terminal_pane.rs
@@ -24,8 +24,8 @@ 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,