This commit is contained in:
2025-07-05 04:59:40 -05:00
parent ec963707a1
commit 6255b9c4f4
4 changed files with 105 additions and 8 deletions
+79
View File
@@ -0,0 +1,79 @@
use std::sync::{Arc, Mutex};
use crate::{
extensions::Handler,
style::RawTransform,
widget::{Element, Widget},
RenderWrapperEvent,
};
pub struct VGrid {
transform: Mutex<RawTransform>,
color: u32,
gap: u16,
}
impl Element for Arc<VGrid> {
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 {
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.y += elem_transform.height + r2.gap;
scope.draw();
elem.0.lock().unwrap().after_render(&scope);
scope.set_parent_size(w, h);
}));
r
}
}
+1
View File
@@ -1,4 +1,5 @@
pub mod div; pub mod div;
pub mod grid;
use crate::Element; use crate::Element;
+10 -8
View File
@@ -1,5 +1,5 @@
use osui::{ use osui::{
elements::div::Div, elements::grid::VGrid,
extensions::{id::IdExtension, tick::TickExtension}, extensions::{id::IdExtension, tick::TickExtension},
style::Transform, style::Transform,
Screen, Screen,
@@ -11,17 +11,19 @@ fn main() {
screen.extension(document.clone()); screen.extension(document.clone());
screen.extension(TickExtension(10)); screen.extension(TickExtension(10));
let my_div = Div::new(0xff0000); let my_div = VGrid::new(0xff0000, 1);
screen screen
.draw(my_div.clone()) .draw(my_div.clone())
.component(Transform::center().dimensions(21, 3)); .component(Transform::center().dimensions(16, 9));
my_div.draw( for i in 1..6 {
screen my_div.draw(
.draw(format!("Hello, World!")) screen
.component(Transform::center()), .draw(format!("Item {i}"))
); .component(Transform::center()),
);
}
screen.run().unwrap(); screen.run().unwrap();
} }
+15
View File
@@ -79,6 +79,21 @@ impl RenderScope {
(self.transform.width, self.transform.height) (self.transform.width, self.transform.height)
} }
pub fn get_size_or(&self, width: u16, height: u16) -> (u16, u16) {
(
if self.transform.width == 0 {
width
} else {
self.transform.width
},
if self.transform.height == 0 {
height
} else {
self.transform.height
},
)
}
pub fn get_size_or_parent(&self) -> (u16, u16) { pub fn get_size_or_parent(&self) -> (u16, u16) {
( (
if self.transform.width == 0 { if self.transform.width == 0 {