Mirrors/ratatui
2
0
Fork 0
mirror of https://github.com/ratatui-org/ratatui synced 2024-11-22 20:53:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(style): allow Modifiers add/remove in const (#287)

Browse source 
Allows Modifiers to be added or removed from `Style` in a const context.
This can be used in the following way:

```
const DEFAULT_MODIFIER: Modifier = Modifier::BOLD.union(Modifier::ITALIC);
const DEFAULT_STYLE: Style = Style::new()
.fg(Color::Red).bg(Color::Black).add_modifier(DEFAULT_MODIFIER);
```
This commit is contained in:
a-kenji 2023-07-08 12:12:48 +02:00 committed by GitHub
parent 56e44a0efa
commit f7c4b44962
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/style.rs
View file

@ -245,9 +245,9 @@ impl Style {
/// assert_eq!(patched.add_modifier, Modifier::BOLD | Modifier::ITALIC); /// assert_eq!(patched.add_modifier, Modifier::BOLD | Modifier::ITALIC);
/// assert_eq!(patched.sub_modifier, Modifier::empty()); /// assert_eq!(patched.sub_modifier, Modifier::empty());
/// ``` /// ```
pub fn add_modifier(mut self, modifier: Modifier) -> Style { pub const fn add_modifier(mut self, modifier: Modifier) -> Style {
self.sub_modifier.remove(modifier); self.sub_modifier = self.sub_modifier.difference(modifier);
self.add_modifier.insert(modifier); self.add_modifier = self.add_modifier.union(modifier);
self self
} }
@ -265,9 +265,9 @@ impl Style {
/// assert_eq!(patched.add_modifier, Modifier::BOLD); /// assert_eq!(patched.add_modifier, Modifier::BOLD);
/// assert_eq!(patched.sub_modifier, Modifier::ITALIC); /// assert_eq!(patched.sub_modifier, Modifier::ITALIC);
/// ``` /// ```
pub fn remove_modifier(mut self, modifier: Modifier) -> Style { pub const fn remove_modifier(mut self, modifier: Modifier) -> Style {
self.add_modifier.remove(modifier); self.add_modifier = self.add_modifier.difference(modifier);
self.sub_modifier.insert(modifier); self.sub_modifier = self.sub_modifier.union(modifier);
self self
} }
@ -500,9 +500,31 @@ mod tests {
); );
} }
} }
#[test] #[test]
fn style_can_be_const() { fn style_can_be_const() {
const _DEFAULT_STYLE: Style = Style::new().fg(Color::Red).bg(Color::Black); const RED: Color = Color::Red;
const BLACK: Color = Color::Black;
const BOLD: Modifier = Modifier::BOLD;
const ITALIC: Modifier = Modifier::ITALIC;
const _RESET: Style = Style::reset(); const _RESET: Style = Style::reset();
const _RED_FG: Style = Style::new().fg(RED);
const _BLACK_BG: Style = Style::new().bg(BLACK);
const _ADD_BOLD: Style = Style::new().add_modifier(BOLD);
const _REMOVE_ITALIC: Style = Style::new().remove_modifier(ITALIC);
const ALL: Style = Style::new()
.fg(RED)
.bg(BLACK)
.add_modifier(BOLD)
.remove_modifier(ITALIC);
assert_eq!(
ALL,
Style::new()
.fg(Color::Red)
.bg(Color::Black)
.add_modifier(Modifier::BOLD)
.remove_modifier(Modifier::ITALIC)
)
} }
} }