osui-rs/osui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

working Rsx

Browse Source
This commit is contained in:
selimaj-dev
2026-01-25 18:58:24 +01:00
parent f6a4bbd8ac
commit a9ecc8da8b
3 changed files with 91 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/hello_world.rs
+48 -53
View File
@@ -40,61 +40,55 @@ fn app(cx: &Arc<Context>) -> View {
}
});
{
let scope = cx.scope();
// {
// cx.dyn_scope(
// {
// let count = count.clone();
// move |scope| {
// if *count.get() != 0 {
// if scope.children.lock().unwrap().len() == 0 {
// scope.child(
// my_component,
// Some(Arc::new(|ctx, view| {
// let area = ctx.allocate(5, 2, 0, 0);
// ctx.draw_view(area, view)
// })),
// );
// }
// } else {
// scope.children.lock().unwrap().clear();
// }
// }
// },
// &[&count],
// );
// }
scope.child(
my_component,
Some(Arc::new(|ctx, view| {
let area = ctx.allocate(5, 0, 0, 0);
ctx.draw_view(area, view)
})),
);
}
// {
// cx.dyn_scope(
// {
// let count = count.clone();
// move |scope| {
// scope.children.lock().unwrap().clear();
{
cx.dyn_scope(
{
let count = count.clone();
move |scope| {
if *count.get() != 0 {
if scope.children.lock().unwrap().len() == 0 {
scope.child(
my_component,
Some(Arc::new(|ctx, view| {
let area = ctx.allocate(5, 2, 0, 0);
ctx.draw_view(area, view)
})),
);
}
} else {
scope.children.lock().unwrap().clear();
}
}
},
&[&count],
);
}
// for i in 0..count.get_dl() {
// scope.view(Arc::new(move |ctx| {
// ctx.draw_text(Point { x: 0, y: i }, &format!("{i}"));
// }));
// }
// }
// },
// &[&count],
// );
// }
{
cx.dyn_scope(
{
let count = count.clone();
move |scope| {
scope.children.lock().unwrap().clear();
for i in 0..count.get_dl() {
scope.view(Arc::new(move |ctx| {
ctx.draw_text(Point { x: 0, y: i }, &format!("{i}"));
}));
rsx! {
my_component (ctx, view) {
let area = ctx.allocate(0, 0, 10, 10);
ctx.draw_view(area, view);
}
}
},
&[&count],
);
}
rsx! {}.view(cx.clone())
.view(cx.clone())
}
fn my_component(cx: &Arc<Context>) -> View {
@@ -112,7 +106,8 @@ fn my_component(cx: &Arc<Context>) -> View {
}
});
Arc::new(move |ctx| {
ctx.draw_text(Point { x: 0, y: 0 }, &format!("Count: {count}"));
})
rsx! {
"Count: {count}"
}
.view(cx.clone())
}
src/component.rs
+6
View File
@@ -179,6 +179,12 @@ impl Context {
}
impl Scope {
pub fn new() -> Arc<Self> {
Arc::new(Self {
children: Mutex::new(Vec::new()),
})
}
pub fn child<F: Fn(&Arc<Context>) -> View + Send + Sync + 'static>(
self: &Arc<Self>,
child: F,
src/macros.rs
+34 -1
View File
@@ -3,9 +3,42 @@ macro_rules! rsx {
() => {
$crate::frontend::Rsx::new()
};
($($rsx:tt)+) => {{
let mut r = $crate::frontend::Rsx::new();
$crate::rsx_scope!(r, $($rsx)+);
r
}};
}
#[macro_export]
macro_rules! rsx_scope {
() => {};
($rsx:expr, $text:literal $($rest:tt)*) => {
let scope = $crate::component::Scope::new();
scope.view(Arc::new(move |ctx| ctx.draw_text(Point { x: 0, y: 0 }, &format!($text))));
$rsx.static_scope(scope);
$crate::rsx_scope!($rsx, $($rest)*);
};
($rsx:expr, $component:ident ($ctx:ident, $view:ident) $body:block $($rest:tt)*) => {
let scope = $crate::component::Scope::new();
scope.child($component, Some(Arc::new(|$ctx, $view| $body)));
$rsx.static_scope(scope);
$crate::rsx_scope!($rsx, $($rest)*);
};
($rsx:expr, $component:ident $($rest:tt)*) => {
let scope = $crate::component::Scope::new();
scope.child($component, None);
$rsx.static_scope(scope);
$crate::rsx_scope!($rsx, $($rest)*);
};
($rsx:expr,) => {};
}