Skip to content

Commit

Permalink
bug: fix using 'none' for chart legend position in configs (#1593)
Browse files Browse the repository at this point in the history
* bug: fix using 'none' for legend position in configs

* forgot memory oops

* update changelog
  • Loading branch information
ClementTsang committed Sep 12, 2024
1 parent eaa5623 commit 3edf430
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ That said, these are more guidelines rather than hardset rules, though the proje
- [#1551](https://github.com/ClementTsang/bottom/pull/1551): Fix missing parent section names in default config.
- [#1552](https://github.com/ClementTsang/bottom/pull/1552): Fix typo in default config.
- [#1578](https://github.com/ClementTsang/bottom/pull/1578): Fix missing selected text background colour in `default-light` theme.
- [#1593](https://github.com/ClementTsang/bottom/pull/1593): Fix using `"none"` for chart legend position in configs.

### Changes

Expand Down
2 changes: 1 addition & 1 deletion src/canvas/components/tui_widget/time_chart.rs
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ impl FromStr for LegendPosition {
type Err = ParseLegendPositionError;

fn from_str(s: &str) -> Result<Self, Self::Err> {
match s.to_ascii_lowercase().as_str() {
match s {
"top" => Ok(Self::Top),
"top-left" => Ok(Self::TopLeft),
"top-right" => Ok(Self::TopRight),
Expand Down
14 changes: 10 additions & 4 deletions src/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -960,8 +960,11 @@ fn get_network_legend_position(
position => Some(parse_config_value!(position.parse(), "network_legend")?),
}
} else if let Some(flags) = &config.flags {
if let Some(legend) = &flags.network_legend {
Some(parse_arg_value!(legend.parse(), "network_legend")?)
if let Some(s) = &flags.network_legend {
match s.to_ascii_lowercase().trim() {
"none" => None,
position => Some(parse_arg_value!(position.parse(), "network_legend")?),
}
} else {
Some(LegendPosition::default())
}
Expand All @@ -981,8 +984,11 @@ fn get_memory_legend_position(
position => Some(parse_config_value!(position.parse(), "memory_legend")?),
}
} else if let Some(flags) = &config.flags {
if let Some(legend) = &flags.memory_legend {
Some(parse_arg_value!(legend.parse(), "memory_legend")?)
if let Some(s) = &flags.memory_legend {
match s.to_ascii_lowercase().trim() {
"none" => None,
position => Some(parse_arg_value!(position.parse(), "memory_legend")?),
}
} else {
Some(LegendPosition::default())
}
Expand Down

0 comments on commit 3edf430

Please sign in to comment.