Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic when window is too small

Browse Source
This commit is contained in:
Capucho 2020-07-28 17:50:24 +01:00 committed by Marcel Märtens
parent 752b2510ee
commit 8b1ba19b4f
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
server-cli/src/main.rs
View File

@ -20,6 +20,7 @@ use std::{
}; };
use tui::{ use tui::{
backend::CrosstermBackend, backend::CrosstermBackend,
layout::Rect,
text::Text, text::Text,
widgets::{Block, Borders, Paragraph, Wrap}, widgets::{Block, Borders, Paragraph, Wrap},
Terminal, Terminal,
@ -273,6 +274,12 @@ fn start_tui(mut sender: mpsc::Sender<Message>) {
let mut stdout = io::stdout(); let mut stdout = io::stdout();
execute!(stdout, EnterAlternateScreen, EnableMouseCapture).unwrap(); execute!(stdout, EnterAlternateScreen, EnableMouseCapture).unwrap();
let hook = std::panic::take_hook();
std::panic::set_hook(Box::new(move |info| {
stop_tui();
hook(info);
}));
std::thread::spawn(move || { std::thread::spawn(move || {
// Start the tui // Start the tui
let stdout = io::stdout(); let stdout = io::stdout();
@ -285,12 +292,18 @@ fn start_tui(mut sender: mpsc::Sender<Message>) {
loop { loop {
let _ = terminal.draw(|f| { let _ = terminal.draw(|f| {
let mut log_rect = f.size(); let (log_rect, input_rect) = if f.size().height > 6 {
log_rect.height -= 3; let mut log_rect = f.size();
log_rect.height -= 3;
let mut input_rect = f.size(); let mut input_rect = f.size();
input_rect.y = input_rect.height - 3; input_rect.y = input_rect.height - 3;
input_rect.height = 3; input_rect.height = 3;
(log_rect, input_rect)
} else {
(f.size(), Rect::default())
};
let block = Block::default().borders(Borders::ALL); let block = Block::default().borders(Borders::ALL);
let size = block.inner(log_rect); let size = block.inner(log_rect);
@ -314,7 +327,7 @@ fn start_tui(mut sender: mpsc::Sender<Message>) {
f.set_cursor(x, size.y); f.set_cursor(x, size.y);
use crossterm::event::{KeyModifiers, *}; use crossterm::event::*;
if poll(Duration::from_millis(10)).unwrap() { if poll(Duration::from_millis(10)).unwrap() {
if let Event::Key(event) = read().unwrap() { if let Event::Key(event) = read().unwrap() {