Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ prompt_current_untyped = "blue;bold"
# cursor character
prompt_cursor = "none;underlined"

# paragraph alignment
block_alignment = "center"

## results styles ##

# overview text
Expand Down
36 changes: 35 additions & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ use serde::{
de::{self, IntoDeserializer},
Deserialize,
};
use tui::style::{Color, Modifier, Style};
use tui::{
layout::Alignment,
style::{Color, Modifier, Style},
};

#[derive(Debug, Deserialize)]
#[serde(default)]
Expand Down Expand Up @@ -51,6 +54,9 @@ pub struct Theme {
#[serde(deserialize_with = "deserialize_style")]
pub prompt_cursor: Style,

#[serde(deserialize_with = "deserialize_align")]
pub block_alignment: Alignment,

// results widget
#[serde(deserialize_with = "deserialize_style")]
pub results_overview: Style,
Expand Down Expand Up @@ -118,6 +124,7 @@ impl Default for Theme {
results_restart_prompt: Style::default()
.fg(Color::Gray)
.add_modifier(Modifier::ITALIC),
block_alignment: Alignment::Left,
}
}
}
Expand Down Expand Up @@ -231,6 +238,33 @@ where
deserializer.deserialize_str(ColorVisitor)
}

fn deserialize_align<'de, D>(deserializer: D) -> Result<Alignment, D::Error>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be better to use serde's derive macros as described here.

where
D: de::Deserializer<'de>,
{
struct AlignmentVisitor;
impl<'de> de::Visitor<'de> for AlignmentVisitor {
type Value = Alignment;

fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
formatter.write_str("an alignment")
}

fn visit_str<E: de::Error>(self, value: &str) -> Result<Self::Value, E> {
match value {
"left" => Ok(Alignment::Left),
"center" => Ok(Alignment::Center),
"right" => Ok(Alignment::Right),
_ => Err(E::invalid_value(
de::Unexpected::Str(value),
&"an alignment",
)),
}
}
}
deserializer.deserialize_str(AlignmentVisitor)
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down
4 changes: 3 additions & 1 deletion src/ui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,9 @@ impl ThemedWidget for &Test {
.borders(Borders::ALL)
.border_type(BorderType::Rounded)
.border_style(theme.prompt_border),
);

)
.alignment(theme.block_alignment);
target.render(chunks[1], buf);
}
}
Expand Down