voxel/hUI
voxel/hUI
1
1
Fork 0
mirror of https://github.com/griffi-gh/hUI.git synced 2024-11-25 16:38:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

actually check event type

Browse source
This commit is contained in:
griffi-gh 2024-03-13 14:35:12 +01:00
parent 3a58e530b3
commit 7d3932f139
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hui/src/element/builtin/interactable.rs
View file

@ -35,7 +35,7 @@ impl<C: UiSignal + 'static> Interactable<C> {
pub fn new(element: Box<dyn UiElement>, event: InteractableEvent, signal: C) -> Self { pub fn new(element: Box<dyn UiElement>, event: InteractableEvent, signal: C) -> Self {
Self { Self {
element, element,
event: InteractableEvent::Click, event,
signal: RefCell::new(Some(signal)), signal: RefCell::new(Some(signal)),
} }
} }
@ -54,7 +54,12 @@ impl<C: UiSignal + 'static> UiElement for Interactable<C> {
let rect = ctx.measure.rect(ctx.layout.position); let rect = ctx.measure.rect(ctx.layout.position);
//XXX: should we do this AFTER normal process call of wrapped element? //XXX: should we do this AFTER normal process call of wrapped element?
if ctx.input.check_click(rect) { let event_happened = match self.event {
InteractableEvent::Click => ctx.input.check_click(rect),
InteractableEvent::Hover => ctx.input.check_hover(rect),
};
if event_happened {
if let Some(sig) = self.signal.take() { if let Some(sig) = self.signal.take() {
ctx.signal.add(sig); ctx.signal.add(sig);
} }