Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: custom styles for the confirm component #1789

Merged
merged 6 commits into from
Oct 17, 2024
Merged
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
14 changes: 14 additions & 0 deletions yazi-config/preset/theme.toml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,20 @@ selected = { reversed = true }
# : }}}


# : Confirm {{{

[confirm]
border = { fg = "blue" }
title = { fg = "blue" }
content = {}
list = {}
btn_yes = { reversed = true }
btn_no = {}
btn_labels = [ " [Y]es ", " (N)o " ]

# : }}}


# : Completion {{{

[completion]
Expand Down
12 changes: 12 additions & 0 deletions yazi-config/src/theme/theme.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ pub struct Theme {
pub manager: Manager,
status: Status,
pub input: Input,
pub confirm: Confirm,
pub pick: Pick,
pub completion: Completion,
pub tasks: Tasks,
Expand Down Expand Up @@ -114,6 +115,17 @@ pub struct Input {
pub selected: Style,
}

#[derive(Deserialize, Serialize)]
pub struct Confirm {
pub border: Style,
pub title: Style,
pub content: Style,
pub list: Style,
pub btn_yes: Style,
pub btn_no: Style,
pub btn_labels: [String; 2],
}

#[derive(Deserialize, Serialize)]
pub struct Pick {
pub border: Style,
Expand Down
11 changes: 8 additions & 3 deletions yazi-fm/src/confirm/buttons.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use ratatui::{buffer::Buffer, layout::{Constraint, Rect}, style::Stylize, text::Span, widgets::{Paragraph, Widget}};
use ratatui::{buffer::Buffer, layout::{Constraint, Rect}, text::Span, widgets::{Paragraph, Widget}};
use yazi_config::THEME;

pub(crate) struct Buttons;

Expand All @@ -7,7 +8,11 @@ impl Widget for Buttons {
let chunks =
ratatui::layout::Layout::horizontal([Constraint::Fill(1), Constraint::Fill(1)]).split(area);

Paragraph::new(Span::raw(" [Y]es ").reversed()).centered().render(chunks[0], buf);
Paragraph::new(Span::raw(" (N)o ")).centered().render(chunks[1], buf);
Paragraph::new(Span::raw(&THEME.confirm.btn_labels[0]).style(THEME.confirm.btn_yes))
.centered()
.render(chunks[0], buf);
Paragraph::new(Span::raw(&THEME.confirm.btn_labels[1]).style(THEME.confirm.btn_no))
.centered()
.render(chunks[1], buf);
}
}
7 changes: 4 additions & 3 deletions yazi-fm/src/confirm/confirm.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use ratatui::{buffer::Buffer, layout::{Alignment, Constraint, Layout, Margin, Rect}, style::{Style, Stylize}, text::Line, widgets::{Block, BorderType, Widget}};
use ratatui::{buffer::Buffer, layout::{Alignment, Constraint, Layout, Margin, Rect}, text::Line, widgets::{Block, BorderType, Widget}};
use yazi_config::THEME;

use crate::Ctx;

Expand All @@ -19,8 +20,8 @@ impl<'a> Widget for Confirm<'a> {

Block::bordered()
.border_type(BorderType::Rounded)
.border_style(Style::new().blue())
.title(Line::styled(&confirm.title, Style::new().blue()))
.border_style(THEME.confirm.border)
.title(Line::styled(&confirm.title, THEME.confirm.title))
.title_alignment(Alignment::Center)
.render(area, buf);

Expand Down
12 changes: 9 additions & 3 deletions yazi-fm/src/confirm/content.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use ratatui::{buffer::Buffer, layout::{Margin, Rect}, style::{Style, Stylize}, widgets::{Block, Borders, Paragraph, Widget}};
use ratatui::{buffer::Buffer, layout::{Margin, Rect}, widgets::{Block, Borders, Paragraph, Widget}};
use yazi_config::THEME;

pub(crate) struct Content<'a> {
p: Paragraph<'a>,
Expand All @@ -14,9 +15,14 @@ impl<'a> Widget for Content<'a> {
let inner = area.inner(Margin::new(1, 0));

// Bottom border
let block = Block::new().borders(Borders::BOTTOM).border_style(Style::new().blue());
let block = Block::new().borders(Borders::BOTTOM).border_style(THEME.confirm.border);
block.clone().render(area.inner(Margin::new(1, 0)), buf);

self.p.alignment(ratatui::layout::Alignment::Center).block(block).render(inner, buf);
self
.p
.alignment(ratatui::layout::Alignment::Center)
.block(block)
.style(THEME.confirm.content)
.render(inner, buf);
}
}
6 changes: 4 additions & 2 deletions yazi-fm/src/confirm/list.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use ratatui::{buffer::Buffer, layout::{Margin, Rect}, style::{Style, Stylize}, widgets::{Block, Borders, Scrollbar, ScrollbarOrientation, ScrollbarState, StatefulWidget, Widget, Wrap}};
use ratatui::{buffer::Buffer, layout::{Margin, Rect}, widgets::{Block, Borders, Scrollbar, ScrollbarOrientation, ScrollbarState, StatefulWidget, Widget, Wrap}};
use yazi_config::THEME;

use crate::Ctx;

Expand All @@ -16,7 +17,7 @@ impl<'a> Widget for List<'a> {
let inner = area.inner(Margin::new(2, 0));

// Bottom border
let block = Block::new().borders(Borders::BOTTOM).border_style(Style::new().blue());
let block = Block::new().borders(Borders::BOTTOM).border_style(THEME.confirm.border);
block.clone().render(area.inner(Margin::new(1, 0)), buf);

let list = self
Expand All @@ -26,6 +27,7 @@ impl<'a> Widget for List<'a> {
.clone()
.scroll((self.cx.confirm.offset as u16, 0))
.block(block)
.style(THEME.confirm.list)
.wrap(Wrap { trim: false });

// Vertical scrollbar
Expand Down