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 7116b565de - Show all commits

View File

@ -23,7 +23,6 @@ pub enum MarginData {
*/ */
#[allow(dead_code)] #[allow(dead_code)]
pub struct Size { pub struct Size {
pub width: i32, pub width: i32,
pub height: i32, pub height: i32,
@ -44,27 +43,6 @@ pub trait Setters {
fn set_align(self, align: Alignment) -> Self; fn set_align(self, align: Alignment) -> Self;
} }
pub trait TextViewSetters {
fn set_text_view_margin(self, margin: MarginData) -> Self;
}
impl TextViewSetters for TextViewBuilder {
fn set_text_view_margin(self, margin: MarginData) -> Self {
match margin {
MarginData::EqualsMargin(margin) => self
.top_margin(margin)
.left_margin(margin)
.bottom_margin(margin)
.right_margin(margin),
MarginData::MultipleMargin(margins) => self
.top_margin(margins.0)
.left_margin(margins.1)
.bottom_margin(margins.2)
.right_margin(margins.3),
}
}
}
/** /**
* Macros * Macros
*/ */