fully working h and v grid

This commit is contained in:
2025-07-05 05:21:16 -05:00
parent 6255b9c4f4
commit 8ae6fb49db
4 changed files with 117 additions and 9 deletions
+71 -1
View File
@@ -12,6 +12,11 @@ pub struct VGrid {
color: u32,
gap: u16,
}
pub struct HGrid {
transform: Mutex<RawTransform>,
color: u32,
gap: u16,
}
impl Element for Arc<VGrid> {
fn render(&mut self, scope: &mut crate::render_scope::RenderScope) {
@@ -33,9 +38,29 @@ impl Element for Arc<VGrid> {
}
}
impl Element for Arc<HGrid> {
fn render(&mut self, scope: &mut crate::render_scope::RenderScope) {
let transform = self.transform.lock().unwrap();
let (w, h) = scope.get_size_or(transform.width, transform.height);
scope.draw_rect(w, h, self.color);
}
fn after_render(&mut self, scope: &crate::render_scope::RenderScope) {
*self.transform.lock().unwrap() = scope.get_transform().clone();
}
fn as_any(&self) -> &dyn std::any::Any {
self
}
fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
self
}
}
impl VGrid {
pub fn new(color: u32, gap: u16) -> Arc<Self> {
Arc::new(VGrid {
Arc::new(Self {
transform: Mutex::new(RawTransform::new()),
color,
gap,
@@ -77,3 +102,48 @@ impl VGrid {
r
}
}
impl HGrid {
pub fn new(color: u32, gap: u16) -> Arc<Self> {
Arc::new(Self {
transform: Mutex::new(RawTransform::new()),
color,
gap,
})
}
pub fn draw(self: &Arc<Self>, element: &Arc<Widget>) -> Arc<Self> {
let r2 = self.clone();
let r = self.clone();
element.component(Handler::new(move |elem, e: &RenderWrapperEvent| {
let scope = e.get_scope();
scope.clear();
let mut transform = r2.transform.lock().unwrap();
let (w, h) = scope.get_parent_size();
scope.set_parent_size(transform.width, transform.height);
if let Some(t) = elem.get() {
scope.set_transform(&t);
}
elem.0.lock().unwrap().render(scope);
if let Some(t) = elem.get() {
scope.set_transform(&t);
}
let elem_transform = scope.get_transform_mut();
elem_transform.x = transform.x;
elem_transform.y += transform.y;
transform.x += elem_transform.width + r2.gap;
scope.draw();
elem.0.lock().unwrap().after_render(&scope);
scope.set_parent_size(w, h);
}));
r
}
}
+14
View File
@@ -16,3 +16,17 @@ impl Element for String {
self
}
}
impl Element for (String, u32) {
fn render(&mut self, scope: &mut crate::render_scope::RenderScope) {
scope.draw_text_colored(&self.0, self.1);
}
fn as_any(&self) -> &dyn std::any::Any {
self
}
fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
self
}
}