From 3dabfdb3390f5de1c2a2a7d3dcde759f31eec20d Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Mon, 25 Mar 2024 18:14:36 +0100 Subject: [PATCH] re-export `Signal` derive from the `signal` module --- hui-examples/examples/ui_test_5_input.rs | 3 ++- hui-examples/examples/ui_test_6_slider.rs | 3 ++- hui-examples/examples/ui_test_7_9patch.rs | 2 +- hui/src/lib.rs | 3 --- hui/src/signal.rs | 3 +++ 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hui-examples/examples/ui_test_5_input.rs b/hui-examples/examples/ui_test_5_input.rs index 5e1ae0c..d1dffd4 100644 --- a/hui-examples/examples/ui_test_5_input.rs +++ b/hui-examples/examples/ui_test_5_input.rs @@ -1,5 +1,6 @@ use hui::{ - color, size, Signal, + color, size, + signal::Signal, draw::TextureFormat, layout::{Alignment, Direction}, element::{ diff --git a/hui-examples/examples/ui_test_6_slider.rs b/hui-examples/examples/ui_test_6_slider.rs index c0555eb..66154d3 100644 --- a/hui-examples/examples/ui_test_6_slider.rs +++ b/hui-examples/examples/ui_test_6_slider.rs @@ -8,8 +8,9 @@ use hui::{ text::Text, UiElementExt, }, + signal::Signal, layout::{Alignment, Direction}, - size, Signal, + size, }; #[derive(Signal)] diff --git a/hui-examples/examples/ui_test_7_9patch.rs b/hui-examples/examples/ui_test_7_9patch.rs index 3b260ee..d8d2d5f 100644 --- a/hui-examples/examples/ui_test_7_9patch.rs +++ b/hui-examples/examples/ui_test_7_9patch.rs @@ -11,7 +11,7 @@ use hui::{ frame::nine_patch::{NinePatchAsset, NinePatchFrame}, layout::Alignment, rect::Rect, - Signal, + signal::Signal, size, }; diff --git a/hui/src/lib.rs b/hui/src/lib.rs index fe61bb5..81dcd6b 100644 --- a/hui/src/lib.rs +++ b/hui/src/lib.rs @@ -9,9 +9,6 @@ #![forbid(unsafe_op_in_unsafe_fn)] #![allow(unused_parens)] -#[cfg(feature = "derive")] -pub use hui_derive::*; - mod instance; mod macros; pub mod layout; diff --git a/hui/src/signal.rs b/hui/src/signal.rs index 1347e6f..f5f91cc 100644 --- a/hui/src/signal.rs +++ b/hui/src/signal.rs @@ -6,6 +6,9 @@ use nohash_hasher::BuildNoHashHasher; pub mod trigger; +#[cfg(feature = "derive")] +pub use hui_derive::Signal; + /// A marker trait for UI Signals pub trait Signal: Any {}