events refactor

wgui/src/components/button.rs

@@ -1,19 +1,19 @@
 use crate::{
 	animation::{Animation, AnimationEasing},
-	components::{self, Component, ComponentBase, ComponentTrait, InitData, tooltip::ComponentTooltip},
+	components::{tooltip::ComponentTooltip, Component, ComponentBase, ComponentTrait, InitData},
 	drawing::{self, Boundary, Color},
-	event::{CallbackDataCommon, EventListenerCollection, EventListenerKind, ListenerHandleVec},
+	event::{CallbackDataCommon, EventListenerCollection, EventListenerID, EventListenerKind},
 	i18n::Translation,
-	layout::{LayoutTask, WidgetID, WidgetPair},
+	layout::{WidgetID, WidgetPair},
 	renderer_vk::{
 		text::{FontWeight, TextStyle},
 		util::centered_matrix,
 	},
 	widget::{
-		ConstructEssentials, EventResult, WidgetData,
 		label::{WidgetLabel, WidgetLabelParams},
 		rectangle::{WidgetRectangle, WidgetRectangleParams},
 		util::WLength,
+		ConstructEssentials, EventResult, WidgetData,
 	},
 };
 use glam::{Mat4, Vec3};
@@ -141,17 +141,14 @@ fn anim_hover_create(data: Rc<Data>, state: Rc<RefCell<State>>, widget_id: Widge
 	)
 }
 
-fn register_event_mouse_enter<U1, U2>(
+fn register_event_mouse_enter(
 	data: Rc<Data>,
 	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection<U1, U2>,
-	listener_handles: &mut ListenerHandleVec,
-) {
+	listeners: &mut EventListenerCollection,
+) -> EventListenerID {
 	listeners.register(
-		listener_handles,
-		data.id_rect,
 		EventListenerKind::MouseEnter,
-		Box::new(move |common, event_data, _, _| {
+		Box::new(move |common, event_data, (), ()| {
 			common.alterables.trigger_haptics();
 			common.alterables.mark_redraw();
 			common.alterables.animate(anim_hover_create(
@@ -182,20 +179,17 @@ fn register_event_mouse_enter<U1, U2>(
 			state.hovered = true;
 			Ok(EventResult::Pass)
 		}),
-	);
+	)
 }
 
-fn register_event_mouse_leave<U1, U2>(
+fn register_event_mouse_leave(
 	data: Rc<Data>,
 	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection<U1, U2>,
-	listener_handles: &mut ListenerHandleVec,
-) {
+	listeners: &mut EventListenerCollection,
+) -> EventListenerID {
 	listeners.register(
-		listener_handles,
-		data.id_rect,
 		EventListenerKind::MouseLeave,
-		Box::new(move |common, event_data, _, _| {
+		Box::new(move |common, event_data, (), ()| {
 			common.alterables.trigger_haptics();
 			common.alterables.animate(anim_hover_create(
 				data.clone(),
@@ -208,20 +202,17 @@ fn register_event_mouse_leave<U1, U2>(
 			state.hovered = false;
 			Ok(EventResult::Pass)
 		}),
-	);
+	)
 }
 
-fn register_event_mouse_press<U1, U2>(
+fn register_event_mouse_press(
 	data: Rc<Data>,
 	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection<U1, U2>,
-	listener_handles: &mut ListenerHandleVec,
-) {
+	listeners: &mut EventListenerCollection,
+) -> EventListenerID {
 	listeners.register(
-		listener_handles,
-		data.id_rect,
 		EventListenerKind::MousePress,
-		Box::new(move |common, event_data, _, _| {
+		Box::new(move |common, event_data, (), ()| {
 			let mut state = state.borrow_mut();
 
 			let rect = event_data.obj.get_as_mut::<WidgetRectangle>().unwrap();
@@ -244,20 +235,17 @@ fn register_event_mouse_press<U1, U2>(
 				Ok(EventResult::Pass)
 			}
 		}),
-	);
+	)
 }
 
-fn register_event_mouse_release<U1, U2>(
+fn register_event_mouse_release(
 	data: Rc<Data>,
 	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection<U1, U2>,
-	listener_handles: &mut ListenerHandleVec,
-) {
+	listeners: &mut EventListenerCollection,
+) -> EventListenerID {
 	listeners.register(
-		listener_handles,
-		data.id_rect,
 		EventListenerKind::MouseRelease,
-		Box::new(move |common, event_data, _, _| {
+		Box::new(move |common, event_data, (), ()| {
 			let rect = event_data.obj.get_as_mut::<WidgetRectangle>().unwrap();
 			anim_hover(
 				rect,
@@ -285,13 +273,10 @@ fn register_event_mouse_release<U1, U2>(
 				Ok(EventResult::Pass)
 			}
 		}),
-	);
+	)
 }
 
-pub fn construct<U1, U2>(
-	ess: &mut ConstructEssentials<U1, U2>,
-	params: Params,
-) -> anyhow::Result<(WidgetPair, Rc<ComponentButton>)> {
+pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Result<(WidgetPair, Rc<ComponentButton>)> {
 	let globals = ess.layout.state.globals.clone();
 	let mut style = params.style;
 
@@ -384,12 +369,17 @@ pub fn construct<U1, U2>(
 		tooltip: None,
 	}));
 
-	let mut base = ComponentBase::default();
-
-	register_event_mouse_enter(data.clone(), state.clone(), ess.listeners, &mut base.lhandles);
-	register_event_mouse_leave(data.clone(), state.clone(), ess.listeners, &mut base.lhandles);
-	register_event_mouse_press(data.clone(), state.clone(), ess.listeners, &mut base.lhandles);
-	register_event_mouse_release(data.clone(), state.clone(), ess.listeners, &mut base.lhandles);
+	let base = ComponentBase {
+		lhandles: {
+			let mut widget = ess.layout.state.widgets.get(id_rect).unwrap().state();
+			vec![
+				register_event_mouse_enter(data.clone(), state.clone(), &mut widget.event_listeners),
+				register_event_mouse_leave(data.clone(), state.clone(), &mut widget.event_listeners),
+				register_event_mouse_press(data.clone(), state.clone(), &mut widget.event_listeners),
+				register_event_mouse_release(data.clone(), state.clone(), &mut widget.event_listeners),
+			]
+		},
+	};
 
 	let button = Rc::new(ComponentButton { base, data, state });
 

wgui/src/components/checkbox.rs

@@ -1,22 +1,22 @@
 use std::{cell::RefCell, rc::Rc};
 use taffy::{
-	AlignItems, JustifyContent,
 	prelude::{length, percent},
+	AlignItems, JustifyContent,
 };
 
 use crate::{
 	animation::{Animation, AnimationEasing},
 	components::{Component, ComponentBase, ComponentTrait, InitData},
 	drawing::Color,
-	event::{CallbackDataCommon, EventAlterables, EventListenerCollection, EventListenerKind, ListenerHandleVec},
+	event::{CallbackDataCommon, EventAlterables, EventListenerCollection, EventListenerID, EventListenerKind},
 	i18n::Translation,
 	layout::{self, LayoutState, WidgetID, WidgetPair},
 	renderer_vk::text::{FontWeight, TextStyle},
 	widget::{
-		ConstructEssentials, EventResult,
 		label::{WidgetLabel, WidgetLabelParams},
 		rectangle::{WidgetRectangle, WidgetRectangleParams},
 		util::WLength,
+		ConstructEssentials, EventResult,
 	},
 };
 
@@ -139,17 +139,10 @@ fn anim_hover_out(state: Rc<RefCell<State>>, widget_id: WidgetID) -> Animation {
 	)
 }
 
-fn register_event_mouse_enter<U1, U2>(
-	data: &Rc<Data>,
-	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection<U1, U2>,
-	listener_handles: &mut ListenerHandleVec,
-) {
+fn register_event_mouse_enter(state: Rc<RefCell<State>>, listeners: &mut EventListenerCollection) -> EventListenerID {
 	listeners.register(
-		listener_handles,
-		data.id_container,
 		EventListenerKind::MouseEnter,
-		Box::new(move |common, event_data, _, _| {
+		Box::new(move |common, event_data, (), ()| {
 			common.alterables.trigger_haptics();
 			common
 				.alterables
@@ -157,20 +150,13 @@ fn register_event_mouse_enter<U1, U2>(
 			state.borrow_mut().hovered = true;
 			Ok(EventResult::Pass)
 		}),
-	);
+	)
 }
 
-fn register_event_mouse_leave<U1, U2>(
-	data: &Rc<Data>,
-	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection<U1, U2>,
-	listener_handles: &mut ListenerHandleVec,
-) {
+fn register_event_mouse_leave(state: Rc<RefCell<State>>, listeners: &mut EventListenerCollection) -> EventListenerID {
 	listeners.register(
-		listener_handles,
-		data.id_container,
 		EventListenerKind::MouseLeave,
-		Box::new(move |common, event_data, _, _| {
+		Box::new(move |common, event_data, (), ()| {
 			common.alterables.trigger_haptics();
 			common
 				.alterables
@@ -178,20 +164,13 @@ fn register_event_mouse_leave<U1, U2>(
 			state.borrow_mut().hovered = false;
 			Ok(EventResult::Pass)
 		}),
-	);
+	)
 }
 
-fn register_event_mouse_press<U1, U2>(
-	data: &Rc<Data>,
-	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection<U1, U2>,
-	listener_handles: &mut ListenerHandleVec,
-) {
+fn register_event_mouse_press(state: Rc<RefCell<State>>, listeners: &mut EventListenerCollection) -> EventListenerID {
 	listeners.register(
-		listener_handles,
-		data.id_container,
 		EventListenerKind::MousePress,
-		Box::new(move |common, event_data, _, _| {
+		Box::new(move |common, event_data, (), ()| {
 			let mut state = state.borrow_mut();
 
 			let rect = event_data.obj.get_as_mut::<WidgetRectangle>().unwrap();
@@ -207,20 +186,17 @@ fn register_event_mouse_press<U1, U2>(
 				Ok(EventResult::Pass)
 			}
 		}),
-	);
+	)
 }
 
-fn register_event_mouse_release<U1, U2>(
+fn register_event_mouse_release(
 	data: Rc<Data>,
 	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection<U1, U2>,
-	listener_handles: &mut ListenerHandleVec,
-) {
+	listeners: &mut EventListenerCollection,
+) -> EventListenerID {
 	listeners.register(
-		listener_handles,
-		data.id_container,
 		EventListenerKind::MouseRelease,
-		Box::new(move |common, event_data, _, _| {
+		Box::new(move |common, event_data, (), ()| {
 			let rect = event_data.obj.get_as_mut::<WidgetRectangle>().unwrap();
 			anim_hover(rect, 1.0, false);
 
@@ -244,13 +220,10 @@ fn register_event_mouse_release<U1, U2>(
 				Ok(EventResult::Pass)
 			}
 		}),
-	);
+	)
 }
 
-pub fn construct<U1, U2>(
-	ess: &mut ConstructEssentials<U1, U2>,
-	params: Params,
-) -> anyhow::Result<(WidgetPair, Rc<ComponentCheckbox>)> {
+pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Result<(WidgetPair, Rc<ComponentCheckbox>)> {
 	let mut style = params.style;
 
 	// force-override style
@@ -348,12 +321,17 @@ pub fn construct<U1, U2>(
 		on_toggle: None,
 	}));
 
-	let mut base = ComponentBase::default();
-
-	register_event_mouse_enter(&data, state.clone(), ess.listeners, &mut base.lhandles);
-	register_event_mouse_leave(&data, state.clone(), ess.listeners, &mut base.lhandles);
-	register_event_mouse_press(&data, state.clone(), ess.listeners, &mut base.lhandles);
-	register_event_mouse_release(data.clone(), state.clone(), ess.listeners, &mut base.lhandles);
+	let base = ComponentBase {
+		lhandles: {
+			let mut widget = ess.layout.state.widgets.get(id_container).unwrap().state();
+			vec![
+				register_event_mouse_enter(state.clone(), &mut widget.event_listeners),
+				register_event_mouse_leave(state.clone(), &mut widget.event_listeners),
+				register_event_mouse_press(state.clone(), &mut widget.event_listeners),
+				register_event_mouse_release(data.clone(), state.clone(), &mut widget.event_listeners),
+			]
+		},
+	};
 
 	let checkbox = Rc::new(ComponentCheckbox { base, data, state });
 

wgui/src/components/mod.rs

@@ -2,7 +2,7 @@ use std::rc::Rc;
 
 use crate::{
 	any::AnyTrait,
-	event::{self, CallbackDataCommon},
+	event::{CallbackDataCommon, EventListenerID},
 };
 
 pub mod button;
@@ -17,7 +17,7 @@ pub struct InitData<'a> {
 // common component data
 #[derive(Default)]
 pub struct ComponentBase {
-	lhandles: event::ListenerHandleVec,
+	lhandles: Vec<EventListenerID>,
 }
 
 pub trait ComponentTrait: AnyTrait {

wgui/src/components/slider.rs

@@ -7,7 +7,7 @@ use crate::{
 	animation::{Animation, AnimationEasing},
 	components::{Component, ComponentBase, ComponentTrait, InitData},
 	drawing::{self},
-	event::{self, CallbackDataCommon, EventListenerCollection, EventListenerKind, ListenerHandleVec},
+	event::{self, CallbackDataCommon, EventListenerCollection, EventListenerKind},
 	i18n::Translation,
 	layout::{WidgetID, WidgetPair},
 	renderer_vk::{
@@ -15,11 +15,11 @@ use crate::{
 		util,
 	},
 	widget::{
-		ConstructEssentials, EventResult,
 		div::WidgetDiv,
 		label::{WidgetLabel, WidgetLabelParams},
 		rectangle::{WidgetRectangle, WidgetRectangleParams},
 		util::WLength,
+		ConstructEssentials, EventResult,
 	},
 };
 
@@ -197,55 +197,46 @@ fn on_leave_anim(common: &mut event::CallbackDataCommon, handle_id: WidgetID) {
 	));
 }
 
-fn register_event_mouse_enter<U1, U2>(
+fn register_event_mouse_enter(
 	data: Rc<Data>,
 	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection<U1, U2>,
-	listener_handles: &mut ListenerHandleVec,
-) {
+	listeners: &mut EventListenerCollection,
+) -> event::EventListenerID {
 	listeners.register(
-		listener_handles,
-		data.body,
 		EventListenerKind::MouseEnter,
-		Box::new(move |common, _data, _, _| {
+		Box::new(move |common, _data, (), ()| {
 			common.alterables.trigger_haptics();
 			state.borrow_mut().hovered = true;
 			on_enter_anim(common, data.slider_handle_rect_id);
 			Ok(EventResult::Pass)
 		}),
-	);
+	)
 }
 
-fn register_event_mouse_leave<U1, U2>(
+fn register_event_mouse_leave(
 	data: Rc<Data>,
 	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection<U1, U2>,
-	listener_handles: &mut ListenerHandleVec,
-) {
+	listeners: &mut EventListenerCollection,
+) -> event::EventListenerID {
 	listeners.register(
-		listener_handles,
-		data.body,
 		EventListenerKind::MouseLeave,
-		Box::new(move |common, _data, _, _| {
+		Box::new(move |common, _data, (), ()| {
 			common.alterables.trigger_haptics();
 			state.borrow_mut().hovered = false;
 			on_leave_anim(common, data.slider_handle_rect_id);
 			Ok(EventResult::Pass)
 		}),
-	);
+	)
 }
 
-fn register_event_mouse_motion<U1, U2>(
+fn register_event_mouse_motion(
 	data: Rc<Data>,
 	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection<U1, U2>,
-	listener_handles: &mut ListenerHandleVec,
-) {
+	listeners: &mut EventListenerCollection,
+) -> event::EventListenerID {
 	listeners.register(
-		listener_handles,
-		data.body,
 		EventListenerKind::MouseMotion,
-		Box::new(move |common, event_data, _, _| {
+		Box::new(move |common, event_data, (), ()| {
 			let mut state = state.borrow_mut();
 
 			if state.dragging {
@@ -255,20 +246,17 @@ fn register_event_mouse_motion<U1, U2>(
 				Ok(EventResult::Pass)
 			}
 		}),
-	);
+	)
 }
 
-fn register_event_mouse_press<U1, U2>(
+fn register_event_mouse_press(
 	data: Rc<Data>,
 	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection<U1, U2>,
-	listener_handles: &mut ListenerHandleVec,
-) {
+	listeners: &mut EventListenerCollection,
+) -> event::EventListenerID {
 	listeners.register(
-		listener_handles,
-		data.body,
 		EventListenerKind::MousePress,
-		Box::new(move |common, event_data, _, _| {
+		Box::new(move |common, event_data, (), ()| {
 			common.alterables.trigger_haptics();
 			let mut state = state.borrow_mut();
 
@@ -280,20 +268,16 @@ fn register_event_mouse_press<U1, U2>(
 				Ok(EventResult::Pass)
 			}
 		}),
-	);
+	)
 }
 
-fn register_event_mouse_release<U1, U2>(
-	data: &Rc<Data>,
+fn register_event_mouse_release(
 	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection<U1, U2>,
-	listener_handles: &mut ListenerHandleVec,
-) {
+	listeners: &mut EventListenerCollection,
+) -> event::EventListenerID {
 	listeners.register(
-		listener_handles,
-		data.body,
 		EventListenerKind::MouseRelease,
-		Box::new(move |common, _data, _, _| {
+		Box::new(move |common, _data, (), ()| {
 			common.alterables.trigger_haptics();
 
 			let mut state = state.borrow_mut();
@@ -304,13 +288,10 @@ fn register_event_mouse_release<U1, U2>(
 				Ok(EventResult::Pass)
 			}
 		}),
-	);
+	)
 }
 
-pub fn construct<U1, U2>(
-	ess: &mut ConstructEssentials<U1, U2>,
-	params: Params,
-) -> anyhow::Result<(WidgetPair, Rc<ComponentSlider>)> {
+pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Result<(WidgetPair, Rc<ComponentSlider>)> {
 	let mut style = params.style;
 	style.position = taffy::Position::Relative;
 	style.min_size = style.size;
@@ -410,14 +391,19 @@ pub fn construct<U1, U2>(
 
 	let state = Rc::new(RefCell::new(state));
 
-	let mut base = ComponentBase::default();
-
-	register_event_mouse_enter(data.clone(), state.clone(), ess.listeners, &mut base.lhandles);
-	register_event_mouse_leave(data.clone(), state.clone(), ess.listeners, &mut base.lhandles);
-	register_event_mouse_motion(data.clone(), state.clone(), ess.listeners, &mut base.lhandles);
-	register_event_mouse_press(data.clone(), state.clone(), ess.listeners, &mut base.lhandles);
-	register_event_mouse_leave(data.clone(), state.clone(), ess.listeners, &mut base.lhandles);
-	register_event_mouse_release(&data, state.clone(), ess.listeners, &mut base.lhandles);
+	let base = ComponentBase {
+		lhandles: {
+			let mut widget = ess.layout.state.widgets.get(body_id).unwrap().state();
+			vec![
+				register_event_mouse_enter(data.clone(), state.clone(), &mut widget.event_listeners),
+				register_event_mouse_leave(data.clone(), state.clone(), &mut widget.event_listeners),
+				register_event_mouse_motion(data.clone(), state.clone(), &mut widget.event_listeners),
+				register_event_mouse_press(data.clone(), state.clone(), &mut widget.event_listeners),
+				register_event_mouse_leave(data.clone(), state.clone(), &mut widget.event_listeners),
+				register_event_mouse_release(state.clone(), &mut widget.event_listeners),
+			]
+		},
+	};
 
 	let slider = Rc::new(ComponentSlider { base, data, state });
 

wgui/src/components/tooltip.rs

@@ -4,15 +4,15 @@ use taffy::prelude::length;
 use crate::{
 	components::{Component, ComponentBase, ComponentTrait, InitData},
 	drawing::Color,
-	event::{EventListenerCollection, EventListenerKind, ListenerHandleVec},
+	event::{EventListenerCollection, EventListenerKind},
 	i18n::Translation,
 	layout::{LayoutTasks, WidgetID, WidgetPair},
 	renderer_vk::text::{FontWeight, TextStyle},
 	widget::{
-		ConstructEssentials, EventResult,
 		label::{WidgetLabel, WidgetLabelParams},
 		rectangle::{WidgetRectangle, WidgetRectangleParams},
 		util::WLength,
+		ConstructEssentials, EventResult,
 	},
 };
 
@@ -53,44 +53,27 @@ impl ComponentTrait for ComponentTooltip {
 
 impl ComponentTooltip {}
 
-fn register_event_mouse_enter<U1, U2>(
-	data: &Rc<Data>,
-	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection<U1, U2>,
-	listener_handles: &mut ListenerHandleVec,
-) {
+fn register_event_mouse_enter(listeners: &mut EventListenerCollection) -> crate::event::EventListenerID {
 	listeners.register(
-		listener_handles,
-		data.id_container,
 		EventListenerKind::MouseEnter,
-		Box::new(move |common, event_data, _, _| {
+		Box::new(move |common, _event_data, (), ()| {
 			common.alterables.trigger_haptics();
 			Ok(EventResult::Pass)
 		}),
-	);
+	)
 }
 
-fn register_event_mouse_leave<U1, U2>(
-	data: &Rc<Data>,
-	state: Rc<RefCell<State>>,
-	listeners: &mut EventListenerCollection<U1, U2>,
-	listener_handles: &mut ListenerHandleVec,
-) {
+fn register_event_mouse_leave(listeners: &mut EventListenerCollection) -> crate::event::EventListenerID {
 	listeners.register(
-		listener_handles,
-		data.id_container,
 		EventListenerKind::MouseEnter,
-		Box::new(move |common, event_data, _, _| {
+		Box::new(move |common, _event_data, (), ()| {
 			common.alterables.trigger_haptics();
 			Ok(EventResult::Pass)
 		}),
-	);
+	)
 }
 
-pub fn construct<U1, U2>(
-	ess: &mut ConstructEssentials<U1, U2>,
-	params: Params,
-) -> anyhow::Result<(WidgetPair, Rc<ComponentTooltip>)> {
+pub fn construct(ess: &mut ConstructEssentials, params: Params) -> anyhow::Result<(WidgetPair, Rc<ComponentTooltip>)> {
 	let style = taffy::Style {
 		align_items: Some(taffy::AlignItems::Center),
 		justify_content: Some(taffy::JustifyContent::Center),
@@ -141,10 +124,15 @@ pub fn construct<U1, U2>(
 
 	let state = Rc::new(RefCell::new(State {}));
 
-	let mut base = ComponentBase::default();
-
-	register_event_mouse_enter(&data, state.clone(), ess.listeners, &mut base.lhandles);
-	register_event_mouse_leave(&data, state.clone(), ess.listeners, &mut base.lhandles);
+	let base = ComponentBase {
+		lhandles: {
+			let mut widget = ess.layout.state.widgets.get(id_container).unwrap().state();
+			vec![
+				register_event_mouse_enter(&mut widget.event_listeners),
+				register_event_mouse_leave(&mut widget.event_listeners),
+			]
+		},
+	};
 
 	let tooltip = Rc::new(ComponentTooltip {
 		base,