Skip to content

Commit

Permalink
fix(config): Add option to disable line wrap
Browse files Browse the repository at this point in the history
  • Loading branch information
devanlooches committed Nov 4, 2022
1 parent b9901a4 commit f32041f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 7 deletions.
1 change: 1 addition & 0 deletions config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module-order = "user delimiter os host kernel uptime packages shell resolution desktop-environment window-manager terminal cpu"
offset = 4
logo-cmd = "auto"
wrap-lines = true

[format]
mode = "classic"
Expand Down
22 changes: 15 additions & 7 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use crate::modules::{
#[serde(rename_all = "kebab-case", default)]
pub struct Config {
module_order: String,
wrap_lines: bool,
offset: usize,
logo_cmd: String,
format: Format,
Expand Down Expand Up @@ -350,7 +351,9 @@ impl Config {
let mut sidelogo = self.get_logo();
let mut order = self.get_module_order();
let maxlength = self.logo_maxlength();
order = Self::wrap_lines(self.offset, &order, maxlength);
if self.wrap_lines {
order = Self::wrap_lines(self.offset, &order, maxlength);
}
match sidelogo.len().cmp(&order.len()) {
Ordering::Greater => order.resize(sidelogo.len(), String::from("")),
Ordering::Less => sidelogo.resize(order.len(), String::from("")),
Expand Down Expand Up @@ -411,11 +414,13 @@ impl Config {
let mut sidelogo = self.get_logo();
let mut info = self.get_module_order();
let logo_maxlength = self.logo_maxlength();
info = Self::wrap_lines(
self.offset + self.format.padding_top + self.format.padding_left + 1 + 2,
&info,
logo_maxlength,
);
if self.wrap_lines {
info = Self::wrap_lines(
self.offset + self.format.padding_top + self.format.padding_left + 1 + 2,
&info,
logo_maxlength,
);
}
match (sidelogo.len() + self.format.padding_top)
.cmp(&(info.len() + self.format.padding_top))
{
Expand Down Expand Up @@ -486,7 +491,9 @@ impl Config {
fn print_bottom_block(&self) {
let sidelogo = self.get_logo();
let mut info = self.get_module_order();
info = Self::wrap_lines(self.offset, &info, 0);
if self.wrap_lines {
info = Self::wrap_lines(self.offset, &info, 0);
}
let info_maxlength = Self::info_maxlength(&info);

for line in sidelogo {
Expand Down Expand Up @@ -550,6 +557,7 @@ impl Default for Config {
fn default() -> Self {
Self {
offset: 4,
wrap_lines: true,
module_order: String::from(
"user delimiter os host kernel uptime packages shell resolution desktop-environment window-manager terminal cpu",
),
Expand Down
1 change: 1 addition & 0 deletions workflow_config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module-order = "user delimiter os host kernel uptime packages shell resolution desktop-environment window-manager cpu"
offset = 4
logo-cmd = "auto"
wrap-lines = false

[format]
mode = "classic"
Expand Down

0 comments on commit f32041f

Please sign in to comment.