mirror of
https://seed.radicle.dev/rad:z39mP9rQAaGmERfUMPULfPUi473tY.git
synced 2026-11-21 10:30:48 +08:00
lib: Fix column spacing
This commit is contained in:
@@ -95,6 +95,26 @@ impl<'a> Column<'a> {
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Spacing(u16);
|
||||
|
||||
impl From<u16> for Spacing {
|
||||
fn from(value: u16) -> Self {
|
||||
Self(value)
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Spacing {
|
||||
fn default() -> Self {
|
||||
Self(0)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<Spacing> for u16 {
|
||||
fn from(spacing: Spacing) -> Self {
|
||||
spacing.0
|
||||
}
|
||||
}
|
||||
|
||||
/// Needs to be implemented for items that are supposed to be rendered in tables.
|
||||
pub trait ToRow<const W: usize> {
|
||||
fn to_row(&self) -> [Cell; W];
|
||||
|
||||
+3
-2
@@ -21,7 +21,7 @@ use crate::event::Event;
|
||||
use crate::store::Update;
|
||||
use crate::terminal::Terminal;
|
||||
use crate::ui::theme::Theme;
|
||||
use crate::ui::{Column, ToRow};
|
||||
use crate::ui::{Column, Spacing, ToRow};
|
||||
use crate::Interrupted;
|
||||
|
||||
use crate::ui::im::widget::Widget;
|
||||
@@ -574,9 +574,10 @@ where
|
||||
&mut self,
|
||||
frame: &mut Frame,
|
||||
columns: Vec<Column<'_>>,
|
||||
spacing: Spacing,
|
||||
borders: Option<Borders>,
|
||||
) -> Response {
|
||||
widget::ColumnBar::new(columns, borders).ui(self, frame)
|
||||
widget::ColumnBar::new(columns, spacing, borders).ui(self, frame)
|
||||
}
|
||||
|
||||
pub fn text_view<'a>(
|
||||
|
||||
+9
-4
@@ -11,7 +11,7 @@ use termion::event::Key;
|
||||
|
||||
use crate::ui::ext::{FooterBlock, FooterBlockType, HeaderBlock};
|
||||
use crate::ui::theme::style;
|
||||
use crate::ui::{layout, span};
|
||||
use crate::ui::{layout, span, Spacing};
|
||||
use crate::ui::{Column, ToRow};
|
||||
|
||||
use super::{Borders, Context, InnerResponse, Response, Ui};
|
||||
@@ -533,12 +533,17 @@ where
|
||||
|
||||
pub struct ColumnBar<'a> {
|
||||
columns: Vec<Column<'a>>,
|
||||
spacing: Spacing,
|
||||
borders: Option<Borders>,
|
||||
}
|
||||
|
||||
impl<'a> ColumnBar<'a> {
|
||||
pub fn new(columns: Vec<Column<'a>>, borders: Option<Borders>) -> Self {
|
||||
Self { columns, borders }
|
||||
pub fn new(columns: Vec<Column<'a>>, spacing: Spacing, borders: Option<Borders>) -> Self {
|
||||
Self {
|
||||
columns,
|
||||
spacing,
|
||||
borders,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -581,7 +586,7 @@ impl Widget for ColumnBar<'_> {
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
let table = ratatui::widgets::Table::default()
|
||||
.column_spacing(1)
|
||||
.column_spacing(self.spacing.into())
|
||||
.rows([Row::new(cells)])
|
||||
.widths(widths);
|
||||
frame.render_widget(table, area);
|
||||
|
||||
Reference in New Issue
Block a user