mirror of
https://seed.radicle.dev/rad:z39mP9rQAaGmERfUMPULfPUi473tY.git
synced 2026-11-16 00:10:38 +08:00
lib: Move label builders to widget module
This commit is contained in:
@@ -14,13 +14,11 @@ use widget::container::{
|
||||
VerticalLine,
|
||||
};
|
||||
use widget::context::{Shortcut, Shortcuts};
|
||||
use widget::label::{Label, Textarea};
|
||||
use widget::label::{self, Label, Textarea};
|
||||
use widget::list::{ColumnWidth, Property, PropertyList, PropertyTable};
|
||||
|
||||
use widget::Widget;
|
||||
|
||||
use self::theme::{style, Theme};
|
||||
use self::widget::label::LabelGroup;
|
||||
use theme::{style, Theme};
|
||||
|
||||
use super::context::Context;
|
||||
|
||||
@@ -28,35 +26,6 @@ pub fn global_listener() -> Widget<GlobalListener> {
|
||||
Widget::new(GlobalListener::default())
|
||||
}
|
||||
|
||||
pub fn label(content: &str) -> Widget<Label> {
|
||||
// TODO: Remove when size constraints are implemented
|
||||
let width = content.chars().count() as u16;
|
||||
|
||||
Widget::new(Label)
|
||||
.content(AttrValue::String(content.to_string()))
|
||||
.height(1)
|
||||
.width(width)
|
||||
}
|
||||
|
||||
pub fn label_group(labels: &[Widget<Label>]) -> Widget<LabelGroup> {
|
||||
let group = LabelGroup::new(labels);
|
||||
let width = labels.iter().fold(0, |total, label| {
|
||||
total
|
||||
+ label
|
||||
.query(Attribute::Width)
|
||||
.unwrap_or(AttrValue::Size(0))
|
||||
.unwrap_size()
|
||||
});
|
||||
|
||||
Widget::new(group).width(width)
|
||||
}
|
||||
|
||||
pub fn reversable_label(content: &str) -> Widget<Label> {
|
||||
let content = &format!(" {content} ");
|
||||
|
||||
label(content)
|
||||
}
|
||||
|
||||
pub fn container_header(theme: &Theme, label: Widget<Label>) -> Widget<Header<1>> {
|
||||
let header = Header::new([label], [ColumnWidth::Grow], theme.clone());
|
||||
|
||||
@@ -73,16 +42,19 @@ pub fn labeled_container(
|
||||
title: &str,
|
||||
component: Box<dyn MockComponent>,
|
||||
) -> Widget<LabeledContainer> {
|
||||
let header = container_header(theme, label(&format!(" {title} ")).style(style::reset()));
|
||||
let header = container_header(
|
||||
theme,
|
||||
label::default(&format!(" {title} ")).style(style::reset()),
|
||||
);
|
||||
let container = LabeledContainer::new(header, component, theme.clone());
|
||||
|
||||
Widget::new(container)
|
||||
}
|
||||
|
||||
pub fn shortcut(theme: &Theme, short: &str, long: &str) -> Widget<Shortcut> {
|
||||
let short = label(short).style(style::gray());
|
||||
let long = label(long).style(style::gray_dim());
|
||||
let divider = label(&theme.icons.whitespace.to_string());
|
||||
let short = label::default(short).style(style::gray());
|
||||
let long = label::default(long).style(style::gray_dim());
|
||||
let divider = label::default(&theme.icons.whitespace.to_string());
|
||||
|
||||
// TODO: Remove when size constraints are implemented
|
||||
let short_w = short.query(Attribute::Width).unwrap().unwrap_size();
|
||||
@@ -96,16 +68,17 @@ pub fn shortcut(theme: &Theme, short: &str, long: &str) -> Widget<Shortcut> {
|
||||
}
|
||||
|
||||
pub fn shortcuts(theme: &Theme, shortcuts: Vec<Widget<Shortcut>>) -> Widget<Shortcuts> {
|
||||
let divider = label(&format!(" {} ", theme.icons.shortcutbar_divider)).style(style::gray_dim());
|
||||
let divider =
|
||||
label::default(&format!(" {} ", theme.icons.shortcutbar_divider)).style(style::gray_dim());
|
||||
let shortcut_bar = Shortcuts::new(shortcuts, divider);
|
||||
|
||||
Widget::new(shortcut_bar).height(1)
|
||||
}
|
||||
|
||||
pub fn property(theme: &Theme, name: &str, value: &str) -> Widget<Property> {
|
||||
let name = label(name).style(style::cyan());
|
||||
let divider = label(&format!(" {} ", theme.icons.property_divider));
|
||||
let value = label(value).style(style::reset());
|
||||
let name = label::default(name).style(style::cyan());
|
||||
let divider = label::default(&format!(" {} ", theme.icons.property_divider));
|
||||
let value = label::default(value).style(style::reset());
|
||||
|
||||
// TODO: Remove when size constraints are implemented
|
||||
let name_w = name.query(Attribute::Width).unwrap().unwrap_size();
|
||||
@@ -137,8 +110,8 @@ pub fn tabs(_theme: &Theme, tabs: Vec<Widget<Label>>) -> Widget<Tabs> {
|
||||
}
|
||||
|
||||
pub fn app_info(context: &Context) -> Widget<AppInfo> {
|
||||
let project = label(context.project().name()).style(style::cyan());
|
||||
let rid = label(&format!(" ({})", context.id())).style(style::yellow());
|
||||
let project = label::default(context.project().name()).style(style::cyan());
|
||||
let rid = label::default(&format!(" ({})", context.id())).style(style::yellow());
|
||||
|
||||
let project_w = project
|
||||
.query(Attribute::Width)
|
||||
@@ -158,7 +131,7 @@ pub fn app_header(
|
||||
theme: &Theme,
|
||||
nav: Option<Widget<Tabs>>,
|
||||
) -> Widget<AppHeader> {
|
||||
let line = label(&theme.icons.tab_overline.to_string()).style(style::magenta());
|
||||
let line = label::default(&theme.icons.tab_overline.to_string()).style(style::magenta());
|
||||
let line = Widget::new(VerticalLine::new(line));
|
||||
let info = app_info(context);
|
||||
let header = AppHeader::new(nav, info, line);
|
||||
|
||||
+11
-13
@@ -3,7 +3,7 @@ use tuirealm::props::{AttrValue, Attribute, Props};
|
||||
use tuirealm::tui::layout::Rect;
|
||||
use tuirealm::{Frame, MockComponent, State};
|
||||
|
||||
use super::label::{Label, LabelGroup};
|
||||
use super::label::{self, Label, LabelGroup};
|
||||
|
||||
use crate::ui::layout;
|
||||
use crate::ui::theme::{style, Theme};
|
||||
@@ -215,19 +215,17 @@ pub fn bar(
|
||||
label_3: &str,
|
||||
label_4: &str,
|
||||
) -> Widget<ContextBar> {
|
||||
use crate::ui::{label, label_group};
|
||||
let label_0 = label::default(&format!(" {label_0} ")).style(style::magenta_reversed());
|
||||
let label_1 = label::default(&format!(" {label_1} ")).style(style::default_reversed());
|
||||
let label_2 = label::default(&format!(" {label_2} ")).style(style::default_reversed());
|
||||
let label_3 = label::default(&format!(" {label_3} ")).style(style::default_reversed());
|
||||
let label_4 = label::default(&format!(" {label_4} ")).style(style::default_reversed());
|
||||
|
||||
let label_0 = label(&format!(" {label_0} ")).style(style::magenta_reversed());
|
||||
let label_1 = label(&format!(" {label_1} ")).style(style::default_reversed());
|
||||
let label_2 = label(&format!(" {label_2} ")).style(style::default_reversed());
|
||||
let label_3 = label(&format!(" {label_3} ")).style(style::default_reversed());
|
||||
let label_4 = label(&format!(" {label_4} ")).style(style::default_reversed());
|
||||
|
||||
let label_0 = label_group(&[label_0]);
|
||||
let label_1 = label_group(&[label_1]);
|
||||
let label_2 = label_group(&[label_2]);
|
||||
let label_3 = label_group(&[label_3]);
|
||||
let label_4 = label_group(&[label_4]);
|
||||
let label_0 = label::group(&[label_0]);
|
||||
let label_1 = label::group(&[label_1]);
|
||||
let label_2 = label::group(&[label_2]);
|
||||
let label_3 = label::group(&[label_3]);
|
||||
let label_4 = label::group(&[label_4]);
|
||||
|
||||
let context_bar = ContextBar::new(label_0, label_1, label_2, label_3, label_4);
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ use crate::ui::theme::{style, Theme};
|
||||
use crate::ui::widget::{Widget, WidgetComponent};
|
||||
|
||||
use super::container::Container;
|
||||
use super::label::Label;
|
||||
use super::label::{self, Label};
|
||||
|
||||
pub struct TextField {
|
||||
input: Widget<Container>,
|
||||
@@ -29,7 +29,7 @@ impl TextField {
|
||||
|
||||
Self {
|
||||
input: container,
|
||||
placeholder: crate::ui::label(title).style(style::gray_dim()),
|
||||
placeholder: label::default(title).style(style::gray_dim()),
|
||||
show_placeholder: true,
|
||||
}
|
||||
}
|
||||
@@ -103,7 +103,7 @@ impl TextArea {
|
||||
|
||||
Self {
|
||||
input: container,
|
||||
placeholder: crate::ui::label(title).style(style::gray_dim()),
|
||||
placeholder: label::default(title).style(style::gray_dim()),
|
||||
show_placeholder: true,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,35 @@ use crate::ui::layout;
|
||||
use crate::ui::theme::style;
|
||||
use crate::ui::widget::{Widget, WidgetComponent};
|
||||
|
||||
pub fn default(content: &str) -> Widget<Label> {
|
||||
// TODO: Remove when size constraints are implemented
|
||||
let width = content.chars().count() as u16;
|
||||
|
||||
Widget::new(Label)
|
||||
.content(AttrValue::String(content.to_string()))
|
||||
.height(1)
|
||||
.width(width)
|
||||
}
|
||||
|
||||
pub fn group(labels: &[Widget<Label>]) -> Widget<LabelGroup> {
|
||||
let group = LabelGroup::new(labels);
|
||||
let width = labels.iter().fold(0, |total, label| {
|
||||
total
|
||||
+ label
|
||||
.query(Attribute::Width)
|
||||
.unwrap_or(AttrValue::Size(0))
|
||||
.unwrap_size()
|
||||
});
|
||||
|
||||
Widget::new(group).width(width)
|
||||
}
|
||||
|
||||
pub fn reversable(content: &str) -> Widget<Label> {
|
||||
let content = &format!(" {content} ");
|
||||
|
||||
default(content)
|
||||
}
|
||||
|
||||
/// A label that can be styled using a foreground color and text modifiers.
|
||||
/// Its height is fixed, its width depends on the length of the text it displays.
|
||||
#[derive(Clone, Default)]
|
||||
|
||||
@@ -10,7 +10,7 @@ use crate::ui::theme::{style, Theme};
|
||||
use crate::ui::widget::{utils, Widget, WidgetComponent};
|
||||
|
||||
use super::container::Header;
|
||||
use super::label::Label;
|
||||
use super::label::{self, Label};
|
||||
|
||||
/// A generic item that can be displayed in a table with [`const W: usize`] columns.
|
||||
pub trait TableItem<const W: usize> {
|
||||
@@ -47,7 +47,7 @@ pub struct Property {
|
||||
|
||||
impl Property {
|
||||
pub fn new(name: Widget<Label>, value: Widget<Label>) -> Self {
|
||||
let divider = crate::ui::label("");
|
||||
let divider = label::default("");
|
||||
Self {
|
||||
name,
|
||||
divider,
|
||||
|
||||
Reference in New Issue
Block a user