summaryrefslogtreecommitdiffstats
path: root/src/canvas
diff options
context:
space:
mode:
Diffstat (limited to 'src/canvas')
-rw-r--r--src/canvas/dialogs/dd_dialog.rs9
-rw-r--r--src/canvas/dialogs/help_dialog.rs5
-rw-r--r--src/canvas/widgets/basic_table_arrows.rs5
-rw-r--r--src/canvas/widgets/battery_display.rs20
-rw-r--r--src/canvas/widgets/cpu_basic.rs5
-rw-r--r--src/canvas/widgets/cpu_graph.rs13
-rw-r--r--src/canvas/widgets/disk_table.rs6
-rw-r--r--src/canvas/widgets/mem_basic.rs5
-rw-r--r--src/canvas/widgets/mem_graph.rs5
-rw-r--r--src/canvas/widgets/network_basic.rs5
-rw-r--r--src/canvas/widgets/network_graph.rs45
-rw-r--r--src/canvas/widgets/process_table.rs17
-rw-r--r--src/canvas/widgets/temperature_table.rs6
13 files changed, 66 insertions, 80 deletions
diff --git a/src/canvas/dialogs/dd_dialog.rs b/src/canvas/dialogs/dd_dialog.rs
index 35a0c067..876552bf 100644
--- a/src/canvas/dialogs/dd_dialog.rs
+++ b/src/canvas/dialogs/dd_dialog.rs
@@ -2,7 +2,6 @@
use std::cmp::min;
use tui::{
- backend::Backend,
layout::{Alignment, Constraint, Direction, Layout, Rect},
terminal::Frame,
text::{Line, Span, Text},
@@ -206,8 +205,8 @@ impl Painter {
None
}
- fn draw_dd_confirm_buttons<B: Backend>(
- &self, f: &mut Frame<'_, B>, button_draw_loc: &Rect, app_state: &mut App,
+ fn draw_dd_confirm_buttons(
+ &self, f: &mut Frame<'_>, button_draw_loc: &Rect, app_state: &mut App,
) {
if MAX_PROCESS_SIGNAL == 1 || !app_state.app_config_fields.is_advanced_kill {
let (yes_button, no_button) = match app_state.delete_dialog_state.selected_signal {
@@ -351,8 +350,8 @@ impl Painter {
}
}
- pub fn draw_dd_dialog<B: Backend>(
- &self, f: &mut Frame<'_, B>, dd_text: Option<Text<'_>>, app_state: &mut App, draw_loc: Rect,
+ pub fn draw_dd_dialog(
+ &self, f: &mut Frame<'_>, dd_text: Option<Text<'_>>, app_state: &mut App, draw_loc: Rect,
) -> bool {
if let Some(dd_text) = dd_text {
let dd_title = if app_state.dd_err.is_some() {
diff --git a/src/canvas/dialogs/help_dialog.rs b/src/canvas/dialogs/help_dialog.rs
index 061405d0..39bf2575 100644
--- a/src/canvas/dialogs/help_dialog.rs
+++ b/src/canvas/dialogs/help_dialog.rs
@@ -1,7 +1,6 @@
use std::cmp::{max, min};
use tui::{
- backend::Backend,
layout::{Alignment, Rect},
terminal::Frame,
text::Line,
@@ -16,9 +15,7 @@ const HELP_BASE: &str = " Help ── Esc to close ";
// TODO: [REFACTOR] Make generic dialog boxes to build off of instead?
impl Painter {
- pub fn draw_help_dialog<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect,
- ) {
+ pub fn draw_help_dialog(&self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect) {
let help_title = Line::from(vec![
Span::styled(" Help ", self.colours.widget_title_style),
Span::styled(
diff --git a/src/canvas/widgets/basic_table_arrows.rs b/src/canvas/widgets/basic_table_arrows.rs
index addd5207..352c7f1e 100644
--- a/src/canvas/widgets/basic_table_arrows.rs
+++ b/src/canvas/widgets/basic_table_arrows.rs
@@ -1,5 +1,4 @@
use tui::{
- backend::Backend,
layout::{Alignment, Constraint, Direction, Layout, Rect},
terminal::Frame,
text::Line,
@@ -13,8 +12,8 @@ use crate::{
};
impl Painter {
- pub fn draw_basic_table_arrows<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
+ pub fn draw_basic_table_arrows(
+ &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
) {
if let Some(current_table) = app_state.widget_map.get(&widget_id) {
let current_table = if let BottomWidgetType::ProcSort = current_table.widget_type {
diff --git a/src/canvas/widgets/battery_display.rs b/src/canvas/widgets/battery_display.rs
index 611859a6..4cd5c23b 100644
--- a/src/canvas/widgets/battery_display.rs
+++ b/src/canvas/widgets/battery_display.rs
@@ -1,5 +1,4 @@
use tui::{
- backend::Backend,
layout::{Constraint, Direction, Layout, Rect},
terminal::Frame,
text::{Line, Span},
@@ -16,8 +15,8 @@ use crate::{
};
impl Painter {
- pub fn draw_battery_display<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, draw_border: bool,
+ pub fn draw_battery_display(
+ &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, draw_border: bool,
widget_id: u64,
) {
let should_get_widget_bounds = app_state.should_get_widget_bounds();
@@ -249,19 +248,20 @@ impl Painter {
// Draw bar
f.render_widget(
- Table::new(battery_charge_rows)
+ Table::new(battery_charge_rows, [Constraint::Percentage(100)])
.block(battery_block.clone())
- .header(header.clone())
- .widths(&[Constraint::Percentage(100)]),
+ .header(header.clone()),
margined_draw_loc,
);
// Draw info
f.render_widget(
- Table::new(battery_rows)
- .block(battery_block)
- .header(header)
- .widths(&[Constraint::Percentage(50), Constraint::Percentage(50)]),
+ Table::new(
+ battery_rows,
+ [Constraint::Percentage(50), Constraint::Percentage(50)],
+ )
+ .block(battery_block)
+ .header(header),
margined_draw_loc,
);
} else {
diff --git a/src/canvas/widgets/cpu_basic.rs b/src/canvas/widgets/cpu_basic.rs
index 1ebf7cc6..da502d69 100644
--- a/src/canvas/widgets/cpu_basic.rs
+++ b/src/canvas/widgets/cpu_basic.rs
@@ -1,7 +1,6 @@
use std::cmp::min;
use tui::{
- backend::Backend,
layout::{Constraint, Direction, Layout, Rect},
terminal::Frame,
widgets::Block,
@@ -17,8 +16,8 @@ use crate::{
impl Painter {
/// Inspired by htop.
- pub fn draw_basic_cpu<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
+ pub fn draw_basic_cpu(
+ &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
) {
// Skip the first element, it's the "all" element
if app_state.converted_data.cpu_data.len() > 1 {
diff --git a/src/canvas/widgets/cpu_graph.rs b/src/canvas/widgets/cpu_graph.rs
index e6957ff6..9e9dab2f 100644
--- a/src/canvas/widgets/cpu_graph.rs
+++ b/src/canvas/widgets/cpu_graph.rs
@@ -1,7 +1,6 @@
use std::borrow::Cow;
use tui::{
- backend::Backend,
layout::{Constraint, Direction, Layout, Rect},
symbols::Marker,
terminal::Frame,
@@ -22,9 +21,7 @@ const AVG_POSITION: usize = 1;
const ALL_POSITION: usize = 0;
impl Painter {
- pub fn draw_cpu<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
- ) {
+ pub fn draw_cpu(&self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, widget_id: u64) {
let legend_width = (draw_loc.width as f64 * 0.15) as u16;
if legend_width < 6 {
@@ -175,8 +172,8 @@ impl Painter {
}
}
- fn draw_cpu_graph<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
+ fn draw_cpu_graph(
+ &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
) {
const Y_BOUNDS: [f64; 2] = [0.0, 100.5];
const Y_LABELS: [Cow<'static, str>; 2] = [Cow::Borrowed(" 0%"), Cow::Borrowed("100%")];
@@ -240,8 +237,8 @@ impl Painter {
}
}
- fn draw_cpu_legend<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
+ fn draw_cpu_legend(
+ &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
) {
let recalculate_column_widths = app_state.should_get_widget_bounds();
if let Some(cpu_widget_state) = app_state
diff --git a/src/canvas/widgets/disk_table.rs b/src/canvas/widgets/disk_table.rs
index b3c2ac6c..cfea61b6 100644
--- a/src/canvas/widgets/disk_table.rs
+++ b/src/canvas/widgets/disk_table.rs
@@ -1,4 +1,4 @@
-use tui::{backend::Backend, layout::Rect, terminal::Frame};
+use tui::{layout::Rect, terminal::Frame};
use crate::{
app::{self},
@@ -7,8 +7,8 @@ use crate::{
};
impl Painter {
- pub fn draw_disk_table<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut app::App, draw_loc: Rect, widget_id: u64,
+ pub fn draw_disk_table(
+ &self, f: &mut Frame<'_>, app_state: &mut app::App, draw_loc: Rect, widget_id: u64,
) {
let recalculate_column_widths = app_state.should_get_widget_bounds();
if let Some(disk_widget_state) = app_state
diff --git a/src/canvas/widgets/mem_basic.rs b/src/canvas/widgets/mem_basic.rs
index 2a35590e..d24ae22e 100644
--- a/src/canvas/widgets/mem_basic.rs
+++ b/src/canvas/widgets/mem_basic.rs
@@ -1,5 +1,4 @@
use tui::{
- backend::Backend,
layout::{Constraint, Direction, Layout, Rect},
terminal::Frame,
widgets::Block,
@@ -10,8 +9,8 @@ use crate::{
};
impl Painter {
- pub fn draw_basic_memory<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
+ pub fn draw_basic_memory(
+ &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
) {
let mem_data = &app_state.converted_data.mem_data;
let mut draw_widgets: Vec<PipeGauge<'_>> = Vec::new();
diff --git a/src/canvas/widgets/mem_graph.rs b/src/canvas/widgets/mem_graph.rs
index 16f5c41d..42e05e02 100644
--- a/src/canvas/widgets/mem_graph.rs
+++ b/src/canvas/widgets/mem_graph.rs
@@ -1,7 +1,6 @@
use std::borrow::Cow;
use tui::{
- backend::Backend,
layout::{Constraint, Rect},
symbols::Marker,
terminal::Frame,
@@ -14,8 +13,8 @@ use crate::{
};
impl Painter {
- pub fn draw_memory_graph<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
+ pub fn draw_memory_graph(
+ &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
) {
const Y_BOUNDS: [f64; 2] = [0.0, 100.5];
const Y_LABELS: [Cow<'static, str>; 2] = [Cow::Borrowed(" 0%"), Cow::Borrowed("100%")];
diff --git a/src/canvas/widgets/network_basic.rs b/src/canvas/widgets/network_basic.rs
index b877396f..63e0e52f 100644
--- a/src/canvas/widgets/network_basic.rs
+++ b/src/canvas/widgets/network_basic.rs
@@ -1,5 +1,4 @@
use tui::{
- backend::Backend,
layout::{Constraint, Direction, Layout, Rect},
terminal::Frame,
text::{Line, Span},
@@ -9,8 +8,8 @@ use tui::{
use crate::{app::App, canvas::Painter, constants::*};
impl Painter {
- pub fn draw_basic_network<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
+ pub fn draw_basic_network(
+ &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
) {
let divided_loc = Layout::default()
.direction(Direction::Horizontal)
diff --git a/src/canvas/widgets/network_graph.rs b/src/canvas/widgets/network_graph.rs
index d21a4698..8f0885fa 100644
--- a/src/canvas/widgets/network_graph.rs
+++ b/src/canvas/widgets/network_graph.rs
@@ -1,5 +1,4 @@
use tui::{
- backend::Backend,
layout::{Constraint, Direction, Layout, Rect},
symbols::Marker,
terminal::Frame,
@@ -18,8 +17,8 @@ use crate::{
};
impl Painter {
- pub fn draw_network<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
+ pub fn draw_network(
+ &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
) {
if app_state.app_config_fields.use_old_network_legend {
const LEGEND_HEIGHT: u16 = 4;
@@ -50,8 +49,8 @@ impl Painter {
}
}
- pub fn draw_network_graph<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
+ pub fn draw_network_graph(
+ &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
hide_legend: bool,
) {
if let Some(network_widget_state) =
@@ -167,8 +166,8 @@ impl Painter {
}
}
- fn draw_network_labels<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
+ fn draw_network_labels(
+ &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
) {
const NETWORK_HEADERS: [&str; 4] = ["RX", "TX", "Total RX", "Total TX"];
@@ -187,22 +186,22 @@ impl Painter {
// Draw
f.render_widget(
- Table::new(total_network)
- .header(Row::new(NETWORK_HEADERS).style(self.colours.table_header_style))
- .block(Block::default().borders(Borders::ALL).border_style(
- if app_state.current_widget.widget_id == widget_id {
- self.colours.highlighted_border_style
- } else {
- self.colours.border_style
- },
- ))
- .style(self.colours.text_style)
- .widths(
- &((std::iter::repeat(draw_loc.width.saturating_sub(2) / 4))
- .take(4)
- .map(Constraint::Length)
- .collect::<Vec<_>>()),
- ),
+ Table::new(
+ total_network,
+ &((std::iter::repeat(draw_loc.width.saturating_sub(2) / 4))
+ .take(4)
+ .map(Constraint::Length)
+ .collect::<Vec<_>>()),
+ )
+ .header(Row::new(NETWORK_HEADERS).style(self.colours.table_header_style))
+ .block(Block::default().borders(Borders::ALL).border_style(
+ if app_state.current_widget.widget_id == widget_id {
+ self.colours.highlighted_border_style
+ } else {
+ self.colours.border_style
+ },
+ ))
+ .style(self.colours.text_style),
draw_loc,
);
}
diff --git a/src/canvas/widgets/process_table.rs b/src/canvas/widgets/process_table.rs
index 534809be..8aef6bea 100644
--- a/src/canvas/widgets/process_table.rs
+++ b/src/canvas/widgets/process_table.rs
@@ -1,5 +1,4 @@
use tui::{
- backend::Backend,
layout::{Alignment, Constraint, Direction, Layout, Rect},
style::Style,
terminal::Frame,
@@ -20,8 +19,8 @@ const SORT_MENU_WIDTH: u16 = 7;
impl Painter {
/// Draws and handles all process-related drawing. Use this.
/// - `widget_id` here represents the widget ID of the process widget itself!
- pub fn draw_process_widget<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, draw_border: bool,
+ pub fn draw_process_widget(
+ &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, draw_border: bool,
widget_id: u64,
) {
if let Some(proc_widget_state) = app_state.states.proc_state.widget_states.get(&widget_id) {
@@ -73,8 +72,8 @@ impl Painter {
/// Draws the process sort box.
/// - `widget_id` represents the widget ID of the process widget itself.an
- fn draw_processes_table<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
+ fn draw_processes_table(
+ &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
) {
let should_get_widget_bounds = app_state.should_get_widget_bounds();
if let Some(proc_widget_state) = app_state
@@ -107,8 +106,8 @@ impl Painter {
/// Draws the process search field.
/// - `widget_id` represents the widget ID of the search box itself --- NOT the process widget
/// state that is stored.
- fn draw_search_field<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, draw_border: bool,
+ fn draw_search_field(
+ &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, draw_border: bool,
widget_id: u64,
) {
fn build_query_span(
@@ -311,8 +310,8 @@ impl Painter {
/// Draws the process sort box.
/// - `widget_id` represents the widget ID of the sort box itself --- NOT the process widget
/// state that is stored.
- fn draw_sort_table<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
+ fn draw_sort_table(
+ &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
) {
let should_get_widget_bounds = app_state.should_get_widget_bounds();
if let Some(pws) = app_state
diff --git a/src/canvas/widgets/temperature_table.rs b/src/canvas/widgets/temperature_table.rs
index 820b0069..6c0475a4 100644
--- a/src/canvas/widgets/temperature_table.rs
+++ b/src/canvas/widgets/temperature_table.rs
@@ -1,4 +1,4 @@
-use tui::{backend::Backend, layout::Rect, terminal::Frame};
+use tui::{layout::Rect, terminal::Frame};
use crate::{
app,
@@ -7,8 +7,8 @@ use crate::{
};
impl Painter {
- pub fn draw_temp_table<B: Backend>(
- &self, f: &mut Frame<'_, B>, app_state: &mut app::App, draw_loc: Rect, widget_id: u64,
+ pub fn draw_temp_table(
+ &self, f: &mut Frame<'_>, app_state: &mut app::App, draw_loc: Rect, widget_id: u64,
) {
let recalculate_column_widths = app_state.should_get_widget_bounds();
if let Some(temp_widget_state) = app_state
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 04:06:21 +0000