some renaming

This commit is contained in:
Clement Tsang 2024-01-01 22:59:24 -05:00
parent e54f71426c
commit ed0139771a
No known key found for this signature in database
GPG Key ID: B17834EA2182446B
31 changed files with 22 additions and 20 deletions

View File

@ -1,7 +1,7 @@
mod dialogs; mod dialogs;
mod drawing_utils; mod drawing_utils;
pub mod styling; pub mod styling;
pub mod tui_widgets; pub mod components;
mod widgets; mod widgets;
use std::str::FromStr; use std::str::FromStr;
@ -71,8 +71,10 @@ pub struct Painter {
widget_layout: BottomLayout, widget_layout: BottomLayout,
} }
// Part of a temporary fix for https://github.com/ClementTsang/bottom/issues/896 /// The constraints of a widget relative to its parent.
enum LayoutConstraint { ///
/// This is used over ratatui's internal representation due to https://github.com/ClementTsang/bottom/issues/896.
pub enum LayoutConstraint {
CanvasHandled, CanvasHandled,
Grow, Grow,
Ratio(u32, u32), Ratio(u32, u32),

View File

@ -1,4 +1,4 @@
//! Cstom ratatui widgets used by the rest of bottom. //! Cstom ratatui widgets used by the rest of bottom as lower-level components.
pub mod data_table; pub mod data_table;
pub mod pipe_gauge; pub mod pipe_gauge;

View File

@ -9,7 +9,7 @@ use tui::{
use crate::{ use crate::{
app::App, app::App,
canvas::{ canvas::{
tui_widgets::pipe_gauge::{LabelLimit, PipeGauge}, components::pipe_gauge::{LabelLimit, PipeGauge},
Painter, Painter,
}, },
constants::*, constants::*,

View File

@ -10,7 +10,7 @@ use crate::{
app::{layout_manager::WidgetDirection, App}, app::{layout_manager::WidgetDirection, App},
canvas::{ canvas::{
drawing_utils::should_hide_x_label, drawing_utils::should_hide_x_label,
tui_widgets::{ components::{
data_table::{DrawInfo, SelectionState}, data_table::{DrawInfo, SelectionState},
time_graph::{GraphData, TimeGraph}, time_graph::{GraphData, TimeGraph},
}, },

View File

@ -3,7 +3,7 @@ use tui::{layout::Rect, terminal::Frame};
use crate::{ use crate::{
app, app,
canvas::{ canvas::{
tui_widgets::data_table::{DrawInfo, SelectionState}, components::data_table::{DrawInfo, SelectionState},
Painter, Painter,
}, },
}; };

View File

@ -6,7 +6,7 @@ use tui::{
use crate::{ use crate::{
app::App, app::App,
canvas::{tui_widgets::pipe_gauge::PipeGauge, Painter}, canvas::{components::pipe_gauge::PipeGauge, Painter},
constants::*, constants::*,
}; };

View File

@ -10,7 +10,7 @@ use crate::{
app::App, app::App,
canvas::{ canvas::{
drawing_utils::should_hide_x_label, drawing_utils::should_hide_x_label,
tui_widgets::time_graph::{GraphData, TimeGraph}, components::time_graph::{GraphData, TimeGraph},
Painter, Painter,
}, },
}; };

View File

@ -10,7 +10,7 @@ use crate::{
app::{App, AxisScaling}, app::{App, AxisScaling},
canvas::{ canvas::{
drawing_utils::should_hide_x_label, drawing_utils::should_hide_x_label,
tui_widgets::{ components::{
time_chart::Point, time_chart::Point,
time_graph::{GraphData, TimeGraph}, time_graph::{GraphData, TimeGraph},
}, },

View File

@ -10,7 +10,7 @@ use unicode_segmentation::UnicodeSegmentation;
use crate::{ use crate::{
app::{App, AppSearchState}, app::{App, AppSearchState},
canvas::{ canvas::{
tui_widgets::data_table::{DrawInfo, SelectionState}, components::data_table::{DrawInfo, SelectionState},
Painter, Painter,
}, },
constants::*, constants::*,

View File

@ -3,7 +3,7 @@ use tui::{layout::Rect, terminal::Frame};
use crate::{ use crate::{
app, app,
canvas::{ canvas::{
tui_widgets::data_table::{DrawInfo, SelectionState}, components::data_table::{DrawInfo, SelectionState},
Painter, Painter,
}, },
}; };

View File

@ -7,7 +7,7 @@ use kstring::KString;
use crate::{ use crate::{
app::{data_farmer::DataCollection, AxisScaling}, app::{data_farmer::DataCollection, AxisScaling},
canvas::tui_widgets::time_chart::Point, canvas::components::time_chart::Point,
data_collection::{cpu::CpuDataType, memory::MemHarvest, temperature::TemperatureType}, data_collection::{cpu::CpuDataType, memory::MemHarvest, temperature::TemperatureType},
utils::{data_prefixes::*, data_units::DataUnit, general::*}, utils::{data_prefixes::*, data_units::DataUnit, general::*},
widgets::{DiskWidgetData, TempWidgetData}, widgets::{DiskWidgetData, TempWidgetData},

View File

@ -7,7 +7,7 @@ use crate::{
app::AppConfigFields, app::AppConfigFields,
canvas::{ canvas::{
styling::CanvasStyling, styling::CanvasStyling,
tui_widgets::data_table::{ components::data_table::{
Column, ColumnHeader, DataTable, DataTableColumn, DataTableProps, DataTableStyling, Column, ColumnHeader, DataTable, DataTableColumn, DataTableProps, DataTableStyling,
DataToCell, DataToCell,
}, },

View File

@ -7,7 +7,7 @@ use crate::{
app::AppConfigFields, app::AppConfigFields,
canvas::{ canvas::{
styling::CanvasStyling, styling::CanvasStyling,
tui_widgets::data_table::{ components::data_table::{
ColumnHeader, DataTableColumn, DataTableProps, DataTableStyling, DataToCell, ColumnHeader, DataTableColumn, DataTableProps, DataTableStyling, DataToCell,
SortColumn, SortDataTable, SortDataTableProps, SortOrder, SortsRow, SortColumn, SortDataTable, SortDataTableProps, SortOrder, SortsRow,
}, },

View File

@ -20,7 +20,7 @@ use crate::{
}, },
canvas::{ canvas::{
styling::CanvasStyling, styling::CanvasStyling,
tui_widgets::data_table::{ components::data_table::{
Column, ColumnHeader, ColumnWidthBounds, DataTable, DataTableColumn, DataTableProps, Column, ColumnHeader, ColumnWidthBounds, DataTable, DataTableColumn, DataTableProps,
DataTableStyling, SortColumn, SortDataTable, SortDataTableProps, SortOrder, SortsRow, DataTableStyling, SortColumn, SortDataTable, SortDataTableProps, SortOrder, SortsRow,
}, },

View File

@ -4,7 +4,7 @@ use serde::{de::Error, Deserialize, Serialize};
use super::ProcWidgetData; use super::ProcWidgetData;
use crate::{ use crate::{
canvas::tui_widgets::data_table::{ColumnHeader, SortsRow}, canvas::components::data_table::{ColumnHeader, SortsRow},
utils::general::sort_partial_fn, utils::general::sort_partial_fn,
}; };

View File

@ -10,7 +10,7 @@ use tui::{text::Text, widgets::Row};
use super::proc_widget_column::ProcColumn; use super::proc_widget_column::ProcColumn;
use crate::{ use crate::{
canvas::{ canvas::{
tui_widgets::data_table::{DataTableColumn, DataToCell}, components::data_table::{DataTableColumn, DataToCell},
Painter, Painter,
}, },
data_collection::processes::ProcessHarvest, data_collection::processes::ProcessHarvest,

View File

@ -3,7 +3,7 @@ use std::borrow::Cow;
use tui::text::Text; use tui::text::Text;
use crate::{ use crate::{
canvas::tui_widgets::data_table::{ColumnHeader, DataTableColumn, DataToCell}, canvas::components::data_table::{ColumnHeader, DataTableColumn, DataToCell},
utils::general::truncate_to_text, utils::general::truncate_to_text,
}; };

View File

@ -8,7 +8,7 @@ use crate::{
app::AppConfigFields, app::AppConfigFields,
canvas::{ canvas::{
styling::CanvasStyling, styling::CanvasStyling,
tui_widgets::data_table::{ components::data_table::{
ColumnHeader, DataTableColumn, DataTableProps, DataTableStyling, DataToCell, ColumnHeader, DataTableColumn, DataTableProps, DataTableStyling, DataToCell,
SortColumn, SortDataTable, SortDataTableProps, SortOrder, SortsRow, SortColumn, SortDataTable, SortDataTableProps, SortOrder, SortsRow,
}, },