summaryrefslogtreecommitdiffstats
path: root/src/canvas/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/canvas/widgets')
-rw-r--r--src/canvas/widgets/basic_table_arrows.rs2
-rw-r--r--src/canvas/widgets/battery_display.rs7
-rw-r--r--src/canvas/widgets/cpu_graph.rs13
-rw-r--r--src/canvas/widgets/disk_table.rs7
-rw-r--r--src/canvas/widgets/mem_graph.rs3
-rw-r--r--src/canvas/widgets/network_graph.rs4
-rw-r--r--src/canvas/widgets/process_table.rs30
-rw-r--r--src/canvas/widgets/temperature_table.rs7
8 files changed, 57 insertions, 16 deletions
diff --git a/src/canvas/widgets/basic_table_arrows.rs b/src/canvas/widgets/basic_table_arrows.rs
index b0202906..85f37e89 100644
--- a/src/canvas/widgets/basic_table_arrows.rs
+++ b/src/canvas/widgets/basic_table_arrows.rs
@@ -140,7 +140,7 @@ impl Painter {
// actually too large - so, we assume all of them are one too big and check via < (see
// https://github.com/ClementTsang/bottom/pull/459 for details).
// - So in other words, to make it simple, we keep this to a standard and overshoot by one here.
- if let Some(basic_table) = &mut app_state.basic_table_widget_state {
+ if let Some(basic_table) = &mut app_state.states.basic_table_widget_state {
basic_table.left_tlc =
Some((margined_draw_loc[0].x, margined_draw_loc[0].y + 1));
basic_table.left_brc = Some((
diff --git a/src/canvas/widgets/battery_display.rs b/src/canvas/widgets/battery_display.rs
index 59171016..635eebc5 100644
--- a/src/canvas/widgets/battery_display.rs
+++ b/src/canvas/widgets/battery_display.rs
@@ -20,8 +20,11 @@ impl Painter {
widget_id: u64,
) {
let should_get_widget_bounds = app_state.should_get_widget_bounds();
- if let Some(battery_widget_state) =
- app_state.battery_state.widget_states.get_mut(&widget_id)
+ if let Some(battery_widget_state) = app_state
+ .states
+ .battery_state
+ .widget_states
+ .get_mut(&widget_id)
{
let is_on_widget = widget_id == app_state.current_widget.widget_id;
let border_style = if is_on_widget {
diff --git a/src/canvas/widgets/cpu_graph.rs b/src/canvas/widgets/cpu_graph.rs
index a9ee8f43..2110ec40 100644
--- a/src/canvas/widgets/cpu_graph.rs
+++ b/src/canvas/widgets/cpu_graph.rs
@@ -38,7 +38,9 @@ impl Painter {
}
}
self.draw_cpu_graph(f, app_state, draw_loc, widget_id);
- if let Some(cpu_widget_state) = app_state.cpu_state.widget_states.get_mut(&widget_id) {
+ if let Some(cpu_widget_state) =
+ app_state.states.cpu_state.widget_states.get_mut(&widget_id)
+ {
cpu_widget_state.is_legend_hidden = true;
}
@@ -180,7 +182,8 @@ impl Painter {
const Y_BOUNDS: [f64; 2] = [0.0, 100.5];
const Y_LABELS: [Cow<'static, str>; 2] = [Cow::Borrowed(" 0%"), Cow::Borrowed("100%")];
- if let Some(cpu_widget_state) = app_state.cpu_state.widget_states.get_mut(&widget_id) {
+ if let Some(cpu_widget_state) = app_state.states.cpu_state.widget_states.get_mut(&widget_id)
+ {
let cpu_data = &app_state.converted_data.cpu_data;
let border_style = self.get_border_style(widget_id, app_state.current_widget.widget_id);
let x_bounds = [0, cpu_widget_state.current_display_time];
@@ -237,7 +240,11 @@ impl Painter {
&self, f: &mut Frame<'_, B>, 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.cpu_state.widget_states.get_mut(&(widget_id - 1))
+ if let Some(cpu_widget_state) = app_state
+ .states
+ .cpu_state
+ .widget_states
+ .get_mut(&(widget_id - 1))
{
// TODO: This line (and the one above, see caller) is pretty dumb but I guess needed for now. Refactor if possible!
cpu_widget_state.is_legend_hidden = false;
diff --git a/src/canvas/widgets/disk_table.rs b/src/canvas/widgets/disk_table.rs
index ac4045a6..b3c2ac6c 100644
--- a/src/canvas/widgets/disk_table.rs
+++ b/src/canvas/widgets/disk_table.rs
@@ -11,7 +11,12 @@ impl Painter {
&self, f: &mut Frame<'_, B>, 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.disk_state.widget_states.get_mut(&widget_id) {
+ if let Some(disk_widget_state) = app_state
+ .states
+ .disk_state
+ .widget_states
+ .get_mut(&widget_id)
+ {
let is_on_widget = app_state.current_widget.widget_id == widget_id;
let draw_info = DrawInfo {
diff --git a/src/canvas/widgets/mem_graph.rs b/src/canvas/widgets/mem_graph.rs
index e47a82f4..c0caa749 100644
--- a/src/canvas/widgets/mem_graph.rs
+++ b/src/canvas/widgets/mem_graph.rs
@@ -20,7 +20,8 @@ impl Painter {
const Y_BOUNDS: [f64; 2] = [0.0, 100.5];
const Y_LABELS: [Cow<'static, str>; 2] = [Cow::Borrowed(" 0%"), Cow::Borrowed("100%")];
- if let Some(mem_widget_state) = app_state.mem_state.widget_states.get_mut(&widget_id) {
+ if let Some(mem_widget_state) = app_state.states.mem_state.widget_states.get_mut(&widget_id)
+ {
let border_style = self.get_border_style(widget_id, app_state.current_widget.widget_id);
let x_bounds = [0, mem_widget_state.current_display_time];
let hide_x_labels = should_hide_x_label(
diff --git a/src/canvas/widgets/network_graph.rs b/src/canvas/widgets/network_graph.rs
index d8c84031..12280076 100644
--- a/src/canvas/widgets/network_graph.rs
+++ b/src/canvas/widgets/network_graph.rs
@@ -55,7 +55,9 @@ impl Painter {
&self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
hide_legend: bool,
) {
- if let Some(network_widget_state) = app_state.net_state.widget_states.get_mut(&widget_id) {
+ if let Some(network_widget_state) =
+ app_state.states.net_state.widget_states.get_mut(&widget_id)
+ {
let network_data_rx = &app_state.converted_data.network_data_rx;
let network_data_tx = &app_state.converted_data.network_data_tx;
let time_start = -(network_widget_state.current_display_time as f64);
diff --git a/src/canvas/widgets/process_table.rs b/src/canvas/widgets/process_table.rs
index 9b0c23ea..1be7730f 100644
--- a/src/canvas/widgets/process_table.rs
+++ b/src/canvas/widgets/process_table.rs
@@ -24,7 +24,7 @@ impl Painter {
&self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, draw_border: bool,
widget_id: u64,
) {
- if let Some(proc_widget_state) = app_state.proc_state.widget_states.get(&widget_id) {
+ if let Some(proc_widget_state) = app_state.states.proc_state.widget_states.get(&widget_id) {
let search_height = if draw_border { 5 } else { 3 };
let is_sort_open = proc_widget_state.is_sort_open;
@@ -58,7 +58,12 @@ impl Painter {
self.draw_processes_table(f, app_state, proc_draw_loc, widget_id);
}
- if let Some(proc_widget_state) = app_state.proc_state.widget_states.get_mut(&widget_id) {
+ if let Some(proc_widget_state) = app_state
+ .states
+ .proc_state
+ .widget_states
+ .get_mut(&widget_id)
+ {
// Reset redraw marker.
if proc_widget_state.force_rerender {
proc_widget_state.force_rerender = false;
@@ -72,7 +77,12 @@ impl Painter {
&self, f: &mut Frame<'_, B>, 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.proc_state.widget_states.get_mut(&widget_id) {
+ if let Some(proc_widget_state) = app_state
+ .states
+ .proc_state
+ .widget_states
+ .get_mut(&widget_id)
+ {
let recalculate_column_widths =
should_get_widget_bounds || proc_widget_state.force_rerender;
@@ -145,8 +155,11 @@ impl Painter {
}
}
- if let Some(proc_widget_state) =
- app_state.proc_state.widget_states.get_mut(&(widget_id - 1))
+ if let Some(proc_widget_state) = app_state
+ .states
+ .proc_state
+ .widget_states
+ .get_mut(&(widget_id - 1))
{
let is_on_widget = widget_id == app_state.current_widget.widget_id;
let num_columns = usize::from(draw_loc.width);
@@ -298,7 +311,12 @@ impl Painter {
&self, f: &mut Frame<'_, B>, 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.proc_state.widget_states.get_mut(&(widget_id - 2)) {
+ if let Some(pws) = app_state
+ .states
+ .proc_state
+ .widget_states
+ .get_mut(&(widget_id - 2))
+ {
let recalculate_column_widths = should_get_widget_bounds || pws.force_rerender;
let is_on_widget = widget_id == app_state.current_widget.widget_id;
diff --git a/src/canvas/widgets/temperature_table.rs b/src/canvas/widgets/temperature_table.rs
index 7388a005..820b0069 100644
--- a/src/canvas/widgets/temperature_table.rs
+++ b/src/canvas/widgets/temperature_table.rs
@@ -11,7 +11,12 @@ impl Painter {
&self, f: &mut Frame<'_, B>, 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.temp_state.widget_states.get_mut(&widget_id) {
+ if let Some(temp_widget_state) = app_state
+ .states
+ .temp_state
+ .widget_states
+ .get_mut(&widget_id)
+ {
let is_on_widget = app_state.current_widget.widget_id == widget_id;
let draw_info = DrawInfo {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 13:25:24 +0000