From d689d7e8ed46a335474b8262bd76f21feaaf0c50 Mon Sep 17 00:00:00 2001 From: Nathaniel Braun Date: Tue, 9 Jul 2019 19:54:45 +0300 Subject: [PATCH] Terminal size to 1-based (#170) (#176) --- crossterm_terminal/src/sys/winapi.rs | 2 +- crossterm_terminal/src/terminal/winapi_terminal.rs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/crossterm_terminal/src/sys/winapi.rs b/crossterm_terminal/src/sys/winapi.rs index 8c513e4..4a2cedd 100644 --- a/crossterm_terminal/src/sys/winapi.rs +++ b/crossterm_terminal/src/sys/winapi.rs @@ -9,7 +9,7 @@ pub fn exit() { pub fn get_terminal_size() -> (u16, u16) { if let Ok(buffer) = ScreenBuffer::current() { let size = buffer.info().unwrap().terminal_size(); - (size.width as u16, size.height as u16) + (size.width + 1, size.height + 1).into() } else { (0, 0) } diff --git a/crossterm_terminal/src/terminal/winapi_terminal.rs b/crossterm_terminal/src/terminal/winapi_terminal.rs index 8908e79..fe1f7ca 100644 --- a/crossterm_terminal/src/terminal/winapi_terminal.rs +++ b/crossterm_terminal/src/terminal/winapi_terminal.rs @@ -39,8 +39,7 @@ impl ITerminal for WinApiTerminal { } fn terminal_size(&self) -> (u16, u16) { - let csbi = ScreenBuffer::current().unwrap(); - csbi.info().unwrap().terminal_size().into() + get_terminal_size() } fn scroll_up(&self, count: i16) -> Result<()> {