merge stable version #2

Merged
doryan merged 97 commits from experimental into main 2024-08-28 18:54:00 +03:00
Showing only changes of commit d3327a7c36 - Show all commits

View File

@ -41,9 +41,9 @@ macro_rules! build_for {
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct Input { pub struct Input<I> {
component: Box, component: Box,
input: TextView, input: I,
input_label: Label, input_label: Label,
input_frame: Frame, input_frame: Frame,
} }
@ -54,7 +54,7 @@ pub struct InputBuilder {
margins: MarginData, margins: MarginData,
} }
impl Product<InputBuilder, Box> for Input { impl<I> Product<InputBuilder, Box> for Input<I> {
fn builder() -> InputBuilder { fn builder() -> InputBuilder {
InputBuilder { InputBuilder {
align: Alignment { align: Alignment {
@ -71,13 +71,13 @@ impl Product<InputBuilder, Box> for Input {
} }
} }
impl Input { impl<I> Input<I> {
pub fn get_input(&self) -> &TextView {
&self.input
} }
pub fn get_frame(&self) -> &Frame { pub fn get_frame(&self) -> &Frame {
&self.input_frame &self.input_frame
pub fn get_input(&self) -> &I {
&self.input
} }
pub fn get_label(&self) -> &Label { pub fn get_label(&self) -> &Label {