impl idlike for widgetview

core/src/event/manager.rs

@@ -1,6 +1,6 @@
 use crate::{
     ActiveData, Event, EventCtx, EventFn, EventIdCtx, EventLike, HasEvents, IdLike, LayerId,
-    WeakWidget, Widget, WidgetEventFn, WidgetId,
+    WeakWidget, WidgetEventFn, WidgetId,
     util::{HashMap, HashSet, TypeMap},
 };
 use std::{any::TypeId, rc::Rc};
@@ -24,15 +24,16 @@ impl<Rsc: HasEvents + 'static> EventManager<Rsc> {
         self.types.type_or_default()
     }
 
-    pub fn register<W: Widget + ?Sized, E: EventLike>(
+    pub fn register<I: IdLike + 'static, E: EventLike>(
         &mut self,
-        id: WeakWidget<W>,
+        id: I,
         event: E,
-        f: impl for<'a> WidgetEventFn<Rsc, <E::Event as Event>::Data<'a>, W>,
+        f: impl for<'a> WidgetEventFn<Rsc, <E::Event as Event>::Data<'a>, I::Widget>,
     ) {
+        let i = id.id();
         self.get_type::<E>().register(id, event, f);
         self.widget_to_types
-            .entry(id.id())
+            .entry(i)
             .or_default()
             .insert(Self::type_key::<E>());
     }
@@ -112,11 +113,11 @@ impl<Rsc: HasEvents, E: Event> Default for TypeEventManager<Rsc, E> {
 }
 
 impl<Rsc: HasEvents + 'static, E: Event> TypeEventManager<Rsc, E> {
-    fn register<W: Widget + ?Sized>(
+    fn register<I: IdLike + 'static>(
         &mut self,
-        widget: WeakWidget<W>,
+        widget: I,
         event: impl EventLike<Event = E>,
-        f: impl for<'a> WidgetEventFn<Rsc, E::Data<'a>, W>,
+        f: impl for<'a> WidgetEventFn<Rsc, E::Data<'a>, I::Widget>,
     ) {
         let event = event.into_event();
         self.map.entry(widget.id()).or_default().push((
@@ -124,7 +125,7 @@ impl<Rsc: HasEvents + 'static, E: Event> TypeEventManager<Rsc, E> {
             Rc::new(move |ctx, rsc| {
                 f(
                     EventIdCtx {
-                        widget,
+                        widget: WeakWidget::new(widget.id()),
                         state: ctx.state,
                         data: ctx.data,
                     },

core/src/widget/view.rs

@@ -1,6 +1,6 @@
 use std::marker::Unsize;
 
-use crate::{Widget, WeakWidget};
+use crate::{IdLike, WeakWidget, Widget};
 
 pub trait WidgetView {
     type Widget: Widget + ?Sized + Unsize<dyn Widget>;
@@ -14,3 +14,11 @@ pub trait HasWidget {
 impl<W: Widget + Unsize<dyn Widget> + ?Sized> HasWidget for WeakWidget<W> {
     type Widget = W;
 }
+
+impl<WV: WidgetView> IdLike for WV {
+    type Widget = WV::Widget;
+
+    fn id(&self) -> super::WidgetId {
+        self.root().id
+    }
+}