lib: Move label builders to widget module

This commit is contained in:
Erik Kundt
2024-01-12 14:39:32 +01:00
parent ddc10a45e7
commit ea91de73cc
8 changed files with 125 additions and 124 deletions
+11 -13
View File
@@ -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);
+3 -3
View File
@@ -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,
}
}
+29
View File
@@ -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)]
+2 -2
View File
@@ -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,