-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added Enum to ViewGroup derive macro
Currently works for both Named and Unamed structures. Right now all fields have to implement View + Drawable. In addition they have to implement Clone + Copy otherwise Transform impl will fail since translate will attempt to move out a value behind a shared reference. This makes it currently incompatible with LinerarLayout. Fixes #20
- Loading branch information
1 parent
888d571
commit 5951bbe
Showing
2 changed files
with
352 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
use embedded_graphics::{ | ||
pixelcolor::BinaryColor, | ||
prelude::{PixelColor, Point, Size}, | ||
primitives::{Circle, Primitive, PrimitiveStyle, Rectangle, Styled, Triangle}, | ||
Drawable, | ||
}; | ||
use embedded_graphics_simulator::{ | ||
BinaryColorTheme, OutputSettingsBuilder, SimulatorDisplay, Window, | ||
}; | ||
use embedded_layout::view_group::Views; | ||
use embedded_layout_macros::ViewGroup; | ||
|
||
#[derive(ViewGroup)] | ||
enum LayoutViews<C: PixelColor> { | ||
TriangleView(Styled<Triangle, PrimitiveStyle<C>>), | ||
CircleView(Styled<Circle, PrimitiveStyle<C>>), | ||
RectangleView(Styled<Rectangle, PrimitiveStyle<C>>), | ||
CombinedView( | ||
Styled<Circle, PrimitiveStyle<C>>, | ||
Styled<Rectangle, PrimitiveStyle<C>>, | ||
), | ||
CombinedViewStruct { | ||
circle: Styled<Circle, PrimitiveStyle<C>>, | ||
square: Styled<Rectangle, PrimitiveStyle<C>>, | ||
}, | ||
} | ||
|
||
fn main() -> Result<(), core::convert::Infallible> { | ||
let mut display: SimulatorDisplay<BinaryColor> = SimulatorDisplay::new(Size::new(100, 50)); | ||
let output_settings = OutputSettingsBuilder::new() | ||
.theme(BinaryColorTheme::OledBlue) | ||
.build(); | ||
|
||
let mut views = Vec::new(); | ||
|
||
(0..5).for_each(|col_idx| { | ||
(0..2).for_each(|row_idx| { | ||
let view = match (col_idx + (row_idx * 5)) % 5 { | ||
0 => { | ||
let p1 = Point::new(col_idx * 20, row_idx * 30); | ||
let p2 = Point::new((col_idx + 1) * 20, row_idx * 30); | ||
let p3 = Point::new((col_idx * 20) + 10, 20 + (row_idx * 30)); | ||
|
||
LayoutViews::TriangleView( | ||
Triangle::new(p1, p2, p3) | ||
.into_styled(PrimitiveStyle::with_stroke(BinaryColor::On, 1)), | ||
) | ||
} | ||
1 => LayoutViews::CircleView( | ||
Circle::new(Point::new(col_idx * 20, row_idx * 30), 20) | ||
.into_styled(PrimitiveStyle::with_stroke(BinaryColor::On, 1)), | ||
), | ||
2 => LayoutViews::RectangleView( | ||
Rectangle::new(Point::new(col_idx * 20, row_idx * 30), Size::new(20, 20)) | ||
.into_styled(PrimitiveStyle::with_stroke(BinaryColor::On, 1)), | ||
), | ||
3 => { | ||
let circle = Circle::new(Point::new(col_idx * 20, row_idx * 30), 20) | ||
.into_styled(PrimitiveStyle::with_stroke(BinaryColor::On, 1)); | ||
let square = | ||
Rectangle::new(Point::new(col_idx * 20, row_idx * 30), Size::new(20, 20)) | ||
.into_styled(PrimitiveStyle::with_stroke(BinaryColor::On, 1)); | ||
|
||
LayoutViews::CombinedView(circle, square) | ||
} | ||
4 => { | ||
let circle = Circle::new(Point::new(col_idx * 20, row_idx * 30), 20) | ||
.into_styled(PrimitiveStyle::with_stroke(BinaryColor::On, 1)); | ||
let square = | ||
Rectangle::new(Point::new(col_idx * 20, row_idx * 30), Size::new(20, 20)) | ||
.into_styled(PrimitiveStyle::with_stroke(BinaryColor::On, 1)); | ||
|
||
LayoutViews::CombinedViewStruct { circle, square } | ||
} | ||
_ => panic!("Out of bounds number"), | ||
}; | ||
|
||
views.push(view); | ||
}); | ||
}); | ||
|
||
Views::new(views.as_mut_slice()).draw(&mut display).unwrap(); | ||
|
||
Window::new("Dynamic Layout Example", &output_settings).show_static(&display); | ||
Ok(()) | ||
} |
Oops, something went wrong.