diff options
author | Benjamin Nguyen <benjamin.van.nguyen@gmail.com> | 2023-06-25 18:37:36 -0700 |
---|---|---|
committer | Benjamin Nguyen <benjamin.van.nguyen@gmail.com> | 2023-06-25 18:37:36 -0700 |
commit | 6669ea92e2b44163c55e1cada9e1f9e1fdf53181 (patch) | |
tree | 6c025a5e4896fb630a8792c0033213043b386e06 | |
parent | b9d09c6831d270ce8a099ae6339a66af51f34c0f (diff) |
visual bug fix
-rw-r--r-- | src/context/config/toml/mod.rs | 4 | ||||
-rw-r--r-- | src/context/mod.rs | 1 | ||||
-rw-r--r-- | src/render/grid/cell.rs | 22 |
3 files changed, 14 insertions, 13 deletions
diff --git a/src/context/config/toml/mod.rs b/src/context/config/toml/mod.rs index 4ac6386..bb6722b 100644 --- a/src/context/config/toml/mod.rs +++ b/src/context/config/toml/mod.rs @@ -200,13 +200,13 @@ mod windows { use std::{env, path::PathBuf}; /// Try to read in config from the following location: - /// - `%APPDATA%/erdtree/.erdtreerc` + /// - `%APPDATA%/erdtree/.erdtree.toml` pub(super) fn load_toml() -> Option<Config> { super::toml_from_env().or_else(toml_from_appdata) } /// Try to read in config from the following location: - /// - `%APPDATA%/erdtree/.erdtreerc` + /// - `%APPDATA%/erdtree/.erdtree.toml` fn toml_from_appdata() -> Option<Config> { let app_data = dirs::config_dir()?; diff --git a/src/context/mod.rs b/src/context/mod.rs index d15acf1..3b24693 100644 --- a/src/context/mod.rs +++ b/src/context/mod.rs @@ -260,6 +260,7 @@ impl Context { // Load in `.erdtreerc` or `.erdtree.toml`. let config_args = if let Some(config) = config::rc::read_config_to_string() { let raw_args = config::rc::parse(&config); + Self::command().get_matches_from(raw_args) } else if let Ok(config) = config::toml::load() { let named_table = user_args.get_one::<String>("config"); diff --git a/src/render/grid/cell.rs b/src/render/grid/cell.rs index 7798374..b0e5849 100644 --- a/src/render/grid/cell.rs +++ b/src/render/grid/cell.rs @@ -278,17 +278,17 @@ impl<'a> Cell<'a> { return write!(f, ""); } - let padding = ctx.max_size_width - + 1 - + match ctx.disk_usage { - DiskUsage::Logical | DiskUsage::Physical => match ctx.unit { - PrefixKind::Si if ctx.human => 2, - PrefixKind::Bin if ctx.human => 3, - PrefixKind::Si => 0, - PrefixKind::Bin => 1, - }, - _ => 0, - }; + let mut padding = ctx.max_size_width + 1; + + match ctx.disk_usage { + DiskUsage::Logical | DiskUsage::Physical => match ctx.unit { + PrefixKind::Si if ctx.human => padding += 2, + PrefixKind::Bin if ctx.human => padding += 3, + PrefixKind::Si => padding += 0, + PrefixKind::Bin => padding += 1, + }, + _ => padding -= 1, + } let formatted_placeholder = format!("{:>padding$}", styles::PLACEHOLDER); |