GRIN/grin-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update Cursive to 0.9 and change Crate to official (#1445)

Browse Source 
* update Cursive (TUI library) from 0.8 to 0.9; and change Crate to official https://github.com/gyscos/Cursive

* use simple cursive = "0.9.0" in Cargo.toml
This commit is contained in:
Gary Yu
2018-08-31 18:35:31 +08:00
committed by Yeastplume
parent d719493483
commit 2f41003f90
4 changed files with 186 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/tui/table.rs
+3 -3
View File
@@ -585,7 +585,7 @@ impl<T: TableViewItem<H>, H: Eq + Hash + Copy + Clone + 'static> TableView<T, H>
let mut column_offset = 0;
let column_count = self.columns.len();
for (index, column) in self.columns.iter().enumerate() {
let printer = &printer.sub_printer((column_offset, 0), printer.size, true);
let printer = &printer.offset((column_offset, 0)).focused(true);
callback(printer, column);
@@ -705,14 +705,14 @@ impl<T: TableViewItem<H> + 'static, H: Eq + Hash + Copy + Clone + 'static> View
});
self.draw_columns(
&printer.sub_printer((0, 1), printer.size, true),
&printer.offset((0, 1)).focused(true),
"┴─",
|printer, column| {
printer.print_hline((0, 0), column.width + 1, "─");
},
);
let printer = &printer.sub_printer((0, 2), printer.size, true);
let printer = &printer.offset((0, 2)).focused(true);
self.scrollbase.draw(printer, |printer, i| {
let color = if i == self.focus {
if !self.column_select && self.enabled && printer.focused {
src/bin/tui/ui.rs
+6 -4
View File
@@ -26,6 +26,7 @@ use cursive::theme::PaletteColor::{
Background, Highlight, HighlightInactive, Primary, Shadow, View,
};
use cursive::theme::{BaseColor, BorderStyle, Color, Theme};
use cursive::traits::Boxable;
use cursive::traits::Identifiable;
use cursive::utils::markup::StyledString;
use cursive::views::{LinearLayout, Panel, StackView, TextView, ViewBox};
@@ -64,7 +65,7 @@ impl UI {
pub fn new(controller_tx: mpsc::Sender<ControllerMessage>) -> UI {
let (ui_tx, ui_rx) = mpsc::channel::<UIMessage>();
let mut grin_ui = UI {
cursive: Cursive::new(),
cursive: Cursive::default(),
ui_tx: ui_tx,
ui_rx: ui_rx,
controller_tx: controller_tx,
@@ -83,7 +84,8 @@ impl UI {
.layer(mining_view)
.layer(peer_view)
.layer(status_view)
.with_id(ROOT_STACK);
.with_id(ROOT_STACK)
.full_height();
let mut title_string = StyledString::new();
title_string.append(StyledString::styled(
@@ -92,7 +94,7 @@ impl UI {
));
let main_layer = LinearLayout::new(Orientation::Vertical)
.child(Panel::new(TextView::new(title_string)))
.child(Panel::new(TextView::new(title_string).full_width()))
.child(
LinearLayout::new(Orientation::Horizontal)
.child(Panel::new(ViewBox::new(main_menu)))
@@ -103,7 +105,7 @@ impl UI {
let mut theme = grin_ui.cursive.current_theme().clone();
modify_theme(&mut theme);
grin_ui.cursive.set_theme(theme);
grin_ui.cursive.add_layer(main_layer);
grin_ui.cursive.add_fullscreen_layer(main_layer);
// Configure a callback (shutdown, for the first test)
let controller_tx_clone = grin_ui.controller_tx.clone();