hodasemi/ui
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Wiki Activity Actions

Fix callbackbuilder

Browse source
This commit is contained in:
Michael Hübner 2025-03-05 08:25:28 +01:00
parent d5fee4d486
commit 6828597672
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/elements/callback_builder.rs
View file

@ -4,7 +4,6 @@ use anyhow::Result;
use ecs::World;
use super::ControllerButton;
use crate::prelude::*;
macro_rules! callbacks {
($name:ident, $($cb:tt)*) => {
@ -28,12 +27,12 @@ macro_rules! callbacks {
};
}
callbacks!(ClickCallbacks, Fn(&mut World, &mut GuiHandler) -> Result<()> + Send + Sync);
callbacks!(SelectCallbacks, Fn(&mut World, &mut GuiHandler, bool) -> anyhow::Result<()> + Send + Sync);
callbacks!(CustomCallbacks, Fn(&mut World, &mut GuiHandler, ControllerButton) -> anyhow::Result<bool> + Send + Sync);
callbacks!(ClickCallbacks, Fn(&mut World) -> Result<()> + Send + Sync);
callbacks!(SelectCallbacks, Fn(&mut World, bool) -> anyhow::Result<()> + Send + Sync);
callbacks!(CustomCallbacks, Fn(&mut World, ControllerButton) -> anyhow::Result<bool> + Send + Sync);
callbacks!(
VecCallbacks,
Fn(&mut World, &mut GuiHandler, &dyn Any) -> Result<()> + Send + Sync
Fn(&mut World, &dyn Any) -> Result<()> + Send + Sync
);
#[cfg(test)]
@ -41,8 +40,8 @@ mod test {
use super::*;
use anyhow::Result;
fn normal_fn() -> impl Fn(&mut World, &mut GuiHandler) -> Result<()> + Send + Sync {
|_, _| Ok(())
fn normal_fn() -> impl Fn(&mut World) -> Result<()> + Send + Sync {
|_| Ok(())
}
#[test]
@ -52,10 +51,7 @@ mod test {
impl Test {
fn set_click_callbacks(
&self,
_callbacks: Vec<(
&str,
Box<dyn Fn(&mut World, &mut GuiHandler) -> Result<()> + Send + Sync>,
)>,
_callbacks: Vec<(&str, Box<dyn Fn(&mut World) -> Result<()> + Send + Sync>)>,
) -> Result<()> {
Ok(())
}