diff --git a/src/core/sense.rs b/src/core/sense.rs index 749fc54..4338c9e 100644 --- a/src/core/sense.rs +++ b/src/core/sense.rs @@ -1,29 +1,25 @@ -use crate::{Sense, SenseFn, Sensor, Ui, Widget, WidgetId, WidgetIdFn, WidgetLike}; +use crate::{Sense, SenseFn, Sensor, Ui, Widget, WidgetId, WidgetIdFnRet, WidgetLike}; pub trait Sensable { - fn on( - self, - sense: Sense, - f: impl SenseFn, - ) -> impl WidgetIdFn; + fn on(self, sense: Sense, f: impl SenseFn) -> WidgetIdFnRet!(W, Ctx); fn id_on( self, sense: Sense, f: impl FnMut(&WidgetId, &mut Ui, &mut Ctx) + 'static + Clone, - ) -> impl WidgetIdFn + ) -> WidgetIdFnRet!(W, Ctx) where W: Widget; fn edit_on( self, sense: Sense, f: impl FnMut(&mut W, &mut Ctx) + 'static + Clone, - ) -> impl WidgetIdFn + ) -> WidgetIdFnRet!(W, Ctx) where W: Widget; } impl, Ctx, Tag> Sensable for W { - fn on(self, sense: Sense, f: impl SenseFn) -> impl WidgetIdFn { + fn on(self, sense: Sense, f: impl SenseFn) -> WidgetIdFnRet!(W::Widget, Ctx) { move |ui| { let id = self.add(ui); ui.add_sensor( @@ -41,7 +37,7 @@ impl, Ctx, Tag> Sensable for W { sense: Sense, // trait copied here bc rust analyzer skill issue mut f: impl FnMut(&WidgetId, &mut Ui, &mut Ctx) + 'static + Clone, - ) -> impl WidgetIdFn + ) -> WidgetIdFnRet!(W::Widget, Ctx) where W::Widget: Widget, { @@ -55,7 +51,7 @@ impl, Ctx, Tag> Sensable for W { sense: Sense, // trait copied here bc rust analyzer skill issue mut f: impl FnMut(&mut W::Widget, &mut Ctx) + 'static + Clone, - ) -> impl WidgetIdFn + ) -> WidgetIdFnRet!(W::Widget, Ctx) where W::Widget: Widget, { diff --git a/src/core/trait_fns.rs b/src/core/trait_fns.rs index 0ea66d7..b93d7cb 100644 --- a/src/core/trait_fns.rs +++ b/src/core/trait_fns.rs @@ -1,28 +1,28 @@ use super::*; -use crate::{UiRegion, Vec2, WidgetArrLike, WidgetFn, WidgetLike}; +use crate::{UiRegion, Vec2, WidgetArrLike, WidgetFnRet, WidgetLike}; pub trait CoreWidget { - fn pad(self, padding: impl Into) -> impl WidgetFn; - fn center(self, size: impl Into) -> impl WidgetFn; - fn region(self, region: UiRegion) -> impl WidgetFn; + fn pad(self, padding: impl Into) -> WidgetFnRet!(Regioned, Ctx); + fn center(self, size: impl Into) -> WidgetFnRet!(Regioned, Ctx); + fn region(self, region: UiRegion) -> WidgetFnRet!(Regioned, Ctx); } impl, Ctx: 'static, Tag> CoreWidget for W { - fn pad(self, padding: impl Into) -> impl WidgetFn { + fn pad(self, padding: impl Into) -> WidgetFnRet!(Regioned, Ctx) { |ui| Regioned { region: padding.into().region(), inner: self.add(ui).erase_type(), } } - fn center(self, size: impl Into) -> impl WidgetFn { + fn center(self, size: impl Into) -> WidgetFnRet!(Regioned, Ctx) { |ui| Regioned { region: UiRegion::center().size(size.into()), inner: self.add(ui).erase_type(), } } - fn region(self, region: UiRegion) -> impl WidgetFn { + fn region(self, region: UiRegion) -> WidgetFnRet!(Regioned, Ctx) { move |ui| Regioned { region, inner: self.add(ui).erase_type(), @@ -31,21 +31,21 @@ impl, Ctx: 'static, Tag> CoreWidget } pub trait CoreWidgetArr { - fn span(self, dir: Dir, lengths: [impl Into; LEN]) -> impl WidgetFn; - fn stack(self) -> impl WidgetFn; + fn span(self, dir: Dir, lengths: [impl Into; LEN]) -> WidgetFnRet!(Span, Ctx); + fn stack(self) -> WidgetFnRet!(Stack, Ctx); } impl, Ctx: 'static, Tag> CoreWidgetArr for Wa { - fn span(self, dir: Dir, lengths: [impl Into; LEN]) -> impl WidgetFn { + fn span(self, dir: Dir, lengths: [impl Into; LEN]) -> WidgetFnRet!(Span, Ctx) { let lengths = lengths.map(Into::into); move |ui| Span { dir, children: self.ui(ui).arr.into_iter().zip(lengths).collect(), } } - fn stack(self) -> impl WidgetFn { + fn stack(self) -> WidgetFnRet!(Stack, Ctx) { move |ui| Stack { children: self.ui(ui).arr.to_vec(), } diff --git a/src/layout/sense.rs b/src/layout/sense.rs index de0eee8..d8af829 100644 --- a/src/layout/sense.rs +++ b/src/layout/sense.rs @@ -33,7 +33,6 @@ pub struct Sensor { pub type SensorMap = HashMap>; pub type ActiveSensors = Vec<(SenseShape, Id)>; -pub trait SenseFn_ = FnMut(&mut Ui, &mut Ctx) + 'static; pub type SenseShape = UiRegion; #[derive(Clone)] pub struct SenseTrigger { @@ -45,10 +44,10 @@ pub struct SensorGroup { pub cursor: ActivationState, pub sensors: Vec>, } -pub trait SenseFn: SenseFn_ { +pub trait SenseFn: FnMut(&mut Ui, &mut Ctx) + 'static { fn box_clone(&self) -> Box>; } -impl + Clone, Ctx> SenseFn for F { +impl, &mut Ctx) + 'static + Clone, Ctx> SenseFn for F { fn box_clone(&self) -> Box> { Box::new(self.clone()) } diff --git a/src/layout/widget.rs b/src/layout/widget.rs index 32abdd5..6be44d2 100644 --- a/src/layout/widget.rs +++ b/src/layout/widget.rs @@ -74,7 +74,7 @@ pub trait WidgetLike { fn with_id( self, f: impl FnOnce(&mut Ui, WidgetId) -> WidgetId, - ) -> impl WidgetIdFn + ) -> WidgetIdFnRet!(W2, Ctx) where Self: Sized, { @@ -85,11 +85,28 @@ pub trait WidgetLike { } } -/// A function that returns a widget given a UI. -/// Useful for defining trait functions on widgets that create a parent widget so that the children -/// don't need to be IDs yet -pub trait WidgetFn, Ctx> = FnOnce(&mut Ui) -> W; -pub trait WidgetIdFn = FnOnce(&mut Ui) -> WidgetId; +// A function that returns a widget given a UI. +// Useful for defining trait functions on widgets that create a parent widget so that the children +// don't need to be IDs yet +// pub trait WidgetFn, Ctx> = FnOnce(&mut Ui) -> W; +// pub trait WidgetIdFn = FnOnce(&mut Ui) -> WidgetId; + +// copium for rust analyzer +macro_rules! WidgetFnRet { + ($W:ty, $Ctx:ty) => { + impl FnOnce(&mut $crate::Ui<$Ctx>) -> $W + }; +} +pub(crate) use WidgetFnRet; +macro_rules! WidgetIdFnRet { + ($W:ty, $Ctx:ty) => { + impl FnOnce(&mut $crate::Ui<$Ctx>) -> $crate::WidgetId<$W> + }; + ($W:ty, $Ctx:ty, $($use:tt)*) => { + impl FnOnce(&mut $crate::Ui<$Ctx>) -> $crate::WidgetId<$W> + use<$($use)*> + }; +} +pub(crate) use WidgetIdFnRet; pub trait Idable { type Widget: Widget; @@ -97,7 +114,7 @@ pub trait Idable { fn id<'a>( self, id: &WidgetId, - ) -> impl WidgetIdFn + use<'a, Self, Ctx, Tag> + ) -> WidgetIdFnRet!(Self::Widget, Ctx, 'a, Self, Ctx, Tag) where Self: Sized, { diff --git a/src/testing/mod.rs b/src/testing/mod.rs index b331146..89e76bf 100644 --- a/src/testing/mod.rs +++ b/src/testing/mod.rs @@ -84,6 +84,7 @@ impl Client { let main = main.clone(); let to = to.clone().erase_type(); Rect::new(color) + .on(Sense::PressEnd, |_, _| {}) .id_on(Sense::PressStart, move |id, ui, _| { ui[&main].inner = to.clone(); ui[id].color = color.add_rgb(-0.2);