tyler.durden/bottom
1
0
Fork 0
mirror of https://github.com/ClementTsang/bottom.git synced 2025-07-23 13:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

other: revert disk usage change for now (#962)

Browse Source 
This is a temp change, this commit will be reverted after 0.7.1 comes out.
This commit is contained in:
Clement Tsang 2023-01-05 23:22:45 -05:00 committed by GitHub
parent d62bdc5cab
commit d3661c2320
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app.rs
View File

@ -1219,12 +1219,6 @@ impl App {
{ {
proc_widget_state.select_column(ProcWidget::PID_OR_COUNT); proc_widget_state.select_column(ProcWidget::PID_OR_COUNT);
} }
} else if let Some(disk) = self
.disk_state
.get_mut_widget_state(self.current_widget.widget_id)
{
disk.table.set_sort_index(5);
disk.force_data_update();
} }
} }
'P' => { 'P' => {
@ -1308,7 +1302,7 @@ impl App {
.disk_state .disk_state
.get_mut_widget_state(self.current_widget.widget_id) .get_mut_widget_state(self.current_widget.widget_id)
{ {
disk.table.set_sort_index(6); disk.table.set_sort_index(5);
disk.force_data_update(); disk.force_data_update();
} }
} }
@ -1317,7 +1311,7 @@ impl App {
.disk_state .disk_state
.get_mut_widget_state(self.current_widget.widget_id) .get_mut_widget_state(self.current_widget.widget_id)
{ {
disk.table.set_sort_index(7); disk.table.set_sort_index(6);
disk.force_data_update(); disk.force_data_update();
} }
} }

5
src/widgets/disk_table.rs
View File

@ -111,7 +111,7 @@ impl ColumnHeader for DiskWidgetColumn {
DiskWidgetColumn::Mount => "Mount(m)", DiskWidgetColumn::Mount => "Mount(m)",
DiskWidgetColumn::Used => "Used(u)", DiskWidgetColumn::Used => "Used(u)",
DiskWidgetColumn::Free => "Free(n)", DiskWidgetColumn::Free => "Free(n)",
DiskWidgetColumn::UsedPercent => "Used%(p)", DiskWidgetColumn::UsedPercent => "Used(u)",
DiskWidgetColumn::FreePercent => "Free%", DiskWidgetColumn::FreePercent => "Free%",
DiskWidgetColumn::Total => "Total(t)", DiskWidgetColumn::Total => "Total(t)",
DiskWidgetColumn::IoRead => "R/s(r)", DiskWidgetColumn::IoRead => "R/s(r)",
@ -213,10 +213,9 @@ impl DiskTableWidget {
let columns = [ let columns = [
SortColumn::soft(DiskWidgetColumn::Disk, Some(0.2)), SortColumn::soft(DiskWidgetColumn::Disk, Some(0.2)),
SortColumn::soft(DiskWidgetColumn::Mount, Some(0.2)), SortColumn::soft(DiskWidgetColumn::Mount, Some(0.2)),
SortColumn::hard(DiskWidgetColumn::Used, 8).default_descending(), SortColumn::hard(DiskWidgetColumn::UsedPercent, 9).default_descending(),
SortColumn::hard(DiskWidgetColumn::Free, 8).default_descending(), SortColumn::hard(DiskWidgetColumn::Free, 8).default_descending(),
SortColumn::hard(DiskWidgetColumn::Total, 9).default_descending(), SortColumn::hard(DiskWidgetColumn::Total, 9).default_descending(),
SortColumn::hard(DiskWidgetColumn::UsedPercent, 9).default_descending(),
SortColumn::hard(DiskWidgetColumn::IoRead, 10).default_descending(), SortColumn::hard(DiskWidgetColumn::IoRead, 10).default_descending(),
SortColumn::hard(DiskWidgetColumn::IoWrite, 11).default_descending(), SortColumn::hard(DiskWidgetColumn::IoWrite, 11).default_descending(),
]; ];