Mirrors/bottom
2
0
Fork 0
mirror of https://github.com/ClementTsang/bottom synced 2024-11-22 20:23:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

bug: fix inconsistent spacing with grouped vs non-grouped in the process widget (#416)

Browse source 
Fixes grouped mode having different spacing than non-grouped mode.
This commit is contained in:
Clement Tsang 2021-02-18 19:15:07 -05:00 committed by GitHub
parent 4db39da75e
commit e6230ef156
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -31,6 +31,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#391](https://github.com/ClementTsang/bottom/pull/391): Show degree symbol on Celsius and Fahrenheit. - [#391](https://github.com/ClementTsang/bottom/pull/391): Show degree symbol on Celsius and Fahrenheit.
## Bug Fixes
- [#416](https://github.com/ClementTsang/bottom/pull/416): Fixes grouped vs ungrouped modes in the processes widget having inconsistent spacing.
## [0.5.7] - 2021-01-30 ## [0.5.7] - 2021-01-30
## Bug Fixes ## Bug Fixes

3
src/canvas/widgets/process_table.rs
View file

@ -52,7 +52,7 @@ static PROCESS_HEADERS_SOFT_WIDTH_MAX_GROUPED_COMMAND: Lazy<Vec<Option<f64>>> =
static PROCESS_HEADERS_SOFT_WIDTH_MAX_GROUPED_TREE: Lazy<Vec<Option<f64>>> = static PROCESS_HEADERS_SOFT_WIDTH_MAX_GROUPED_TREE: Lazy<Vec<Option<f64>>> =
Lazy::new(|| vec![None, Some(0.5), None, None, None, None, None, None]); Lazy::new(|| vec![None, Some(0.5), None, None, None, None, None, None]);
static PROCESS_HEADERS_SOFT_WIDTH_MAX_GROUPED_ELSE: Lazy<Vec<Option<f64>>> = static PROCESS_HEADERS_SOFT_WIDTH_MAX_GROUPED_ELSE: Lazy<Vec<Option<f64>>> =
Lazy::new(|| vec![None, Some(0.4), None, None, None, None, None, None]); Lazy::new(|| vec![None, Some(0.3), None, None, None, None, None, None]);
static PROCESS_HEADERS_SOFT_WIDTH_MAX_NO_GROUP_COMMAND: Lazy<Vec<Option<f64>>> = Lazy::new(|| { static PROCESS_HEADERS_SOFT_WIDTH_MAX_NO_GROUP_COMMAND: Lazy<Vec<Option<f64>>> = Lazy::new(|| {
vec![ vec![
@ -356,6 +356,7 @@ impl ProcessTableWidget for Painter {
.iter() .iter()
.map(|entry| UnicodeWidthStr::width(entry.as_str()) as u16) .map(|entry| UnicodeWidthStr::width(entry.as_str()) as u16)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let soft_widths_min = column_widths let soft_widths_min = column_widths
.iter() .iter()
.map(|width| Some(*width)) .map(|width| Some(*width))