mirror of
https://codeberg.org/unspeaker/tek.git
synced 2025-12-09 05:06:43 +01:00
wip: Outset=Center+2*Grow, Inset=Center+2*Shrink
This commit is contained in:
parent
c9b79e76fc
commit
4b413cfb60
2 changed files with 203 additions and 120 deletions
|
|
@ -14,87 +14,126 @@ impl Widget for TestArea {
|
|||
}
|
||||
|
||||
#[test]
|
||||
fn test_offset () -> Usually<()> {
|
||||
let area: [u16;4] = [50, 50, 100, 100];
|
||||
let test = TestArea(3, 3);
|
||||
assert_eq!(Offset::X(1, test).layout(area)?, Some([51, 50, 3, 3]));
|
||||
assert_eq!(Offset::Y(1, test).layout(area)?, Some([50, 51, 3, 3]));
|
||||
assert_eq!(Offset::XY(1, 1, test).layout(area)?, Some([51, 51, 3, 3]));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_outset () -> Usually<()> {
|
||||
let area: [u16;4] = [50, 50, 100, 100];
|
||||
let test = TestArea(3, 3);
|
||||
assert_eq!(Outset::X(1, test).layout(area)?, Some([49, 50, 5, 1]));
|
||||
assert_eq!(Outset::Y(1, test).layout(area)?, Some([50, 49, 1, 5]));
|
||||
assert_eq!(Outset::XY(1, 1, test).layout(area)?, Some([49, 49, 5, 5]));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_inset () -> Usually<()> {
|
||||
let area: [u16;4] = [50, 50, 100, 100];
|
||||
let test = TestArea(3, 3);
|
||||
assert_eq!(Inset::X(1, test).layout(area)?, Some([51, 50, 1, 3]));
|
||||
assert_eq!(Inset::Y(1, test).layout(area)?, Some([50, 51, 3, 1]));
|
||||
assert_eq!(Inset::XY(1, 1, test).layout(area)?, Some([51, 51, 1, 1]));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_stuff () -> Usually<()> {
|
||||
let area: [u16;4] = [0, 0, 100, 100];
|
||||
assert_eq!("1".layout(area)?,
|
||||
Some([0, 0, 1, 1]));
|
||||
assert_eq!("333".layout(area)?,
|
||||
Some([0, 0, 3, 1]));
|
||||
assert_eq!(Layers::new(|add|{add(&"1")?;add(&"333")}).layout(area)?,
|
||||
Some([0, 0, 3, 1]));
|
||||
assert_eq!(Split::down(|add|{add(&"1")?;add(&"333")}).layout(area)?,
|
||||
Some([0, 0, 3, 2]));
|
||||
assert_eq!(Split::right(|add|{add(&"1")?;add(&"333")}).layout(area)?,
|
||||
Some([0, 0, 4, 1]));
|
||||
assert_eq!(Split::down(|add|{
|
||||
add(&Split::right(|add|{add(&"1")?;add(&"333")}))?;
|
||||
add(&"55555")
|
||||
}).layout(area)?,
|
||||
Some([0, 0, 5, 2]));
|
||||
let area: [u16;4] = [1, 1, 100, 100];
|
||||
assert_eq!(Outset::X(1, Split::right(|add|{add(&"1")?;add(&"333")})).layout(area)?,
|
||||
Some([0, 1, 6, 1]));
|
||||
assert_eq!(Outset::Y(1, Split::right(|add|{add(&"1")?;add(&"333")})).layout(area)?,
|
||||
Some([1, 0, 4, 3]));
|
||||
assert_eq!(Outset::XY(1, 1, Split::right(|add|{add(&"1")?;add(&"333")})).layout(area)?,
|
||||
Some([0, 0, 6, 3]));
|
||||
assert_eq!(Split::down(|add|{
|
||||
add(&Outset::XY(1, 1, "1"))?;
|
||||
add(&Outset::XY(1, 1, "333"))
|
||||
}).layout(area)?,
|
||||
Some([1, 1, 5, 6]));
|
||||
let area: [u16;4] = [1, 1, 95, 100];
|
||||
fn test_misc () -> Usually<()> {
|
||||
let area: [u16;4] = [0, 0, 10, 10];
|
||||
let test = TestArea(4, 4);
|
||||
assert_eq!(test.layout(area)?,
|
||||
Some([0, 0, 4, 4]));
|
||||
assert_eq!(Align::Center(test).layout(area)?,
|
||||
Some([3, 3, 4, 4]));
|
||||
assert_eq!(Align::Center(Split::down(|add|{
|
||||
add(&Outset::XY(1, 1, "1"))?;
|
||||
add(&Outset::XY(1, 1, "333"))
|
||||
add(&test)?;
|
||||
add(&test)
|
||||
})).layout(area)?,
|
||||
Some([46, 48, 5, 6]));
|
||||
Some([3, 1, 4, 8]));
|
||||
assert_eq!(Align::Center(Split::down(|add|{
|
||||
add(&Layers::new(|add|{
|
||||
//add(&Outset::XY(1, 1, FillBg(Color::Rgb(0,128,0))))?;
|
||||
add(&Outset::XY(1, 1, "1"))?;
|
||||
add(&Outset::XY(1, 1, "333"))?;
|
||||
//add(&FillBg(Color::Rgb(0,128,0)))?;
|
||||
Ok(())
|
||||
add(&Outset::XY(2, 2, test))?;
|
||||
add(&test)
|
||||
})).layout(area)?,
|
||||
Some([2, 0, 6, 10]));
|
||||
assert_eq!(Align::Center(Split::down(|add|{
|
||||
add(&Outset::XY(2, 2, test))?;
|
||||
add(&Inset::XY(2, 2, test))
|
||||
})).layout(area)?,
|
||||
Some([2, 1, 6, 8]));
|
||||
assert_eq!(Split::down(|add|{
|
||||
add(&Outset::XY(2, 2, test))?;
|
||||
add(&Inset::XY(2, 2, test))
|
||||
}).layout(area)?,
|
||||
Some([0, 0, 6, 8]));
|
||||
assert_eq!(Split::right(|add|{
|
||||
add(&Split::down(|add|{
|
||||
add(&Outset::XY(2, 2, test))?;
|
||||
add(&Inset::XY(2, 2, test))
|
||||
}))?;
|
||||
add(&Layers::new(|add|{
|
||||
//add(&Outset::XY(1, 1, FillBg(Color::Rgb(0,0,128))))?;
|
||||
add(&Outset::XY(1, 1, "555"))?;
|
||||
add(&Outset::XY(1, 1, "777777"))?;
|
||||
//add(&FillBg(Color::Rgb(0,0,128)))?;
|
||||
Ok(())
|
||||
}))
|
||||
})).layout(area)?,
|
||||
Some([46, 48, 5, 6]));
|
||||
add(&Align::Center(TestArea(2 ,2)))
|
||||
}).layout(area)?,
|
||||
Some([0, 0, 8, 8]));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
//#[test]
|
||||
//fn test_offset () -> Usually<()> {
|
||||
//let area: [u16;4] = [50, 50, 100, 100];
|
||||
//let test = TestArea(3, 3);
|
||||
//assert_eq!(Offset::X(1, test).layout(area)?, Some([51, 50, 3, 3]));
|
||||
//assert_eq!(Offset::Y(1, test).layout(area)?, Some([50, 51, 3, 3]));
|
||||
//assert_eq!(Offset::XY(1, 1, test).layout(area)?, Some([51, 51, 3, 3]));
|
||||
//Ok(())
|
||||
//}
|
||||
|
||||
//#[test]
|
||||
//fn test_outset () -> Usually<()> {
|
||||
//let area: [u16;4] = [50, 50, 100, 100];
|
||||
//let test = TestArea(3, 3);
|
||||
//assert_eq!(Outset::X(1, test).layout(area)?, Some([49, 50, 5, 3]));
|
||||
//assert_eq!(Outset::Y(1, test).layout(area)?, Some([50, 49, 3, 5]));
|
||||
//assert_eq!(Outset::XY(1, 1, test).layout(area)?, Some([49, 49, 5, 5]));
|
||||
//Ok(())
|
||||
//}
|
||||
|
||||
//#[test]
|
||||
//fn test_inset () -> Usually<()> {
|
||||
//let area: [u16;4] = [50, 50, 100, 100];
|
||||
//let test = TestArea(3, 3);
|
||||
//assert_eq!(Inset::X(1, test).layout(area)?, Some([51, 50, 1, 3]));
|
||||
//assert_eq!(Inset::Y(1, test).layout(area)?, Some([50, 51, 3, 1]));
|
||||
//assert_eq!(Inset::XY(1, 1, test).layout(area)?, Some([51, 51, 1, 1]));
|
||||
//Ok(())
|
||||
//}
|
||||
|
||||
//#[test]
|
||||
//fn test_stuff () -> Usually<()> {
|
||||
//let area: [u16;4] = [0, 0, 100, 100];
|
||||
//assert_eq!("1".layout(area)?,
|
||||
//Some([0, 0, 1, 1]));
|
||||
//assert_eq!("333".layout(area)?,
|
||||
//Some([0, 0, 3, 1]));
|
||||
//assert_eq!(Layers::new(|add|{add(&"1")?;add(&"333")}).layout(area)?,
|
||||
//Some([0, 0, 3, 1]));
|
||||
//assert_eq!(Split::down(|add|{add(&"1")?;add(&"333")}).layout(area)?,
|
||||
//Some([0, 0, 3, 2]));
|
||||
//assert_eq!(Split::right(|add|{add(&"1")?;add(&"333")}).layout(area)?,
|
||||
//Some([0, 0, 4, 1]));
|
||||
//assert_eq!(Split::down(|add|{
|
||||
//add(&Split::right(|add|{add(&"1")?;add(&"333")}))?;
|
||||
//add(&"55555")
|
||||
//}).layout(area)?,
|
||||
//Some([0, 0, 5, 2]));
|
||||
//let area: [u16;4] = [1, 1, 100, 100];
|
||||
//assert_eq!(Outset::X(1, Split::right(|add|{add(&"1")?;add(&"333")})).layout(area)?,
|
||||
//Some([0, 1, 6, 1]));
|
||||
//assert_eq!(Outset::Y(1, Split::right(|add|{add(&"1")?;add(&"333")})).layout(area)?,
|
||||
//Some([1, 0, 4, 3]));
|
||||
//assert_eq!(Outset::XY(1, 1, Split::right(|add|{add(&"1")?;add(&"333")})).layout(area)?,
|
||||
//Some([0, 0, 6, 3]));
|
||||
//assert_eq!(Split::down(|add|{
|
||||
//add(&Outset::XY(1, 1, "1"))?;
|
||||
//add(&Outset::XY(1, 1, "333"))
|
||||
//}).layout(area)?,
|
||||
//Some([1, 1, 5, 6]));
|
||||
//let area: [u16;4] = [1, 1, 95, 100];
|
||||
//assert_eq!(Align::Center(Split::down(|add|{
|
||||
//add(&Outset::XY(1, 1, "1"))?;
|
||||
//add(&Outset::XY(1, 1, "333"))
|
||||
//})).layout(area)?,
|
||||
//Some([46, 48, 5, 6]));
|
||||
//assert_eq!(Align::Center(Split::down(|add|{
|
||||
//add(&Layers::new(|add|{
|
||||
////add(&Outset::XY(1, 1, FillBg(Color::Rgb(0,128,0))))?;
|
||||
//add(&Outset::XY(1, 1, "1"))?;
|
||||
//add(&Outset::XY(1, 1, "333"))?;
|
||||
////add(&FillBg(Color::Rgb(0,128,0)))?;
|
||||
//Ok(())
|
||||
//}))?;
|
||||
//add(&Layers::new(|add|{
|
||||
////add(&Outset::XY(1, 1, FillBg(Color::Rgb(0,0,128))))?;
|
||||
//add(&Outset::XY(1, 1, "555"))?;
|
||||
//add(&Outset::XY(1, 1, "777777"))?;
|
||||
////add(&FillBg(Color::Rgb(0,0,128)))?;
|
||||
//Ok(())
|
||||
//}))
|
||||
//})).layout(area)?,
|
||||
//Some([46, 48, 5, 6]));
|
||||
//Ok(())
|
||||
//}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue