summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClement Tsang <34804052+ClementTsang@users.noreply.github.com>2023-01-05 23:22:45 -0500
committerGitHub <noreply@github.com>2023-01-05 23:22:45 -0500
commitd3661c23200a66c7dc01f4e534d8d7e97dc188d2 (patch)
tree67f1ff0c740f34241a9eecf8987189e924a7991b
parentd62bdc5cab346f43c54df6d0ae8b2c277d851b36 (diff)
other: revert disk usage change for now (#962)
This is a temp change, this commit will be reverted after 0.7.1 comes out.
-rw-r--r--src/app.rs10
-rw-r--r--src/widgets/disk_table.rs5
2 files changed, 4 insertions, 11 deletions
diff --git a/src/app.rs b/src/app.rs
index 2cfa4ebe..55089d34 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -1219,12 +1219,6 @@ impl App {
{
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' => {
@@ -1308,7 +1302,7 @@ impl App {
.disk_state
.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();
}
}
@@ -1317,7 +1311,7 @@ impl App {
.disk_state
.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();
}
}
diff --git a/src/widgets/disk_table.rs b/src/widgets/disk_table.rs
index 1d0e0ce0..25b5af61 100644
--- a/src/widgets/disk_table.rs
+++ b/src/widgets/disk_table.rs
@@ -111,7 +111,7 @@ impl ColumnHeader for DiskWidgetColumn {
DiskWidgetColumn::Mount => "Mount(m)",
DiskWidgetColumn::Used => "Used(u)",
DiskWidgetColumn::Free => "Free(n)",
- DiskWidgetColumn::UsedPercent => "Used%(p)",
+ DiskWidgetColumn::UsedPercent => "Used(u)",
DiskWidgetColumn::FreePercent => "Free%",
DiskWidgetColumn::Total => "Total(t)",
DiskWidgetColumn::IoRead => "R/s(r)",
@@ -213,10 +213,9 @@ impl DiskTableWidget {
let columns = [
SortColumn::soft(DiskWidgetColumn::Disk, 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::Total, 9).default_descending(),
- SortColumn::hard(DiskWidgetColumn::UsedPercent, 9).default_descending(),
SortColumn::hard(DiskWidgetColumn::IoRead, 10).default_descending(),
SortColumn::hard(DiskWidgetColumn::IoWrite, 11).default_descending(),
];