Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

widget event handling into macro

Browse Source
This commit is contained in:
galister
2025-06-21 21:13:33 +09:00
parent 9759dff8b9
commit cd05818465
8 changed files with 86 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wgui/src/components/button.rs
View File

@@ -147,7 +147,7 @@ pub fn construct(
// Highlight background on mouse enter
{
let button = button.clone();
widget.add_event_listener(EventListener::MouseEnter(Box::new(move |data| {
widget.add_event_listener(EventListener::MouseEnter(Box::new(move |data, _| {
data
.animations
.push(anim_hover_in(button.clone(), data.widget_id));
@@ -157,7 +157,7 @@ pub fn construct(
// Bring back old color on mouse leave
{
let button = button.clone();
widget.add_event_listener(EventListener::MouseLeave(Box::new(move |data| {
widget.add_event_listener(EventListener::MouseLeave(Box::new(move |data, _| {
data
.animations
.push(anim_hover_out(button.clone(), data.widget_id));
@@ -165,4 +165,4 @@ pub fn construct(
}
Ok(button)
}
}

14
wgui/src/event.rs
View File

@@ -41,8 +41,12 @@ pub struct MouseWheelEvent {
pub device: usize,
}
pub struct InternalStateChangeEvent {
pub metadata: usize,
}
pub enum Event {
InternalStateChange,
InternalStateChange(InternalStateChangeEvent),
MouseDown(MouseDownEvent),
MouseLeave(MouseLeaveEvent),
MouseMotion(MouseMotionEvent),
@@ -117,11 +121,11 @@ impl<'a> WidgetCallback<'a> for CallbackData<'a> {
}
}
pub type MouseEnterCallback = Box<dyn Fn(&mut CallbackData)>;
pub type MouseLeaveCallback = Box<dyn Fn(&mut CallbackData)>;
pub type MouseEnterCallback = Box<dyn Fn(&mut CallbackData, ())>;
pub type MouseLeaveCallback = Box<dyn Fn(&mut CallbackData, ())>;
pub type MousePressCallback = Box<dyn Fn(&mut CallbackData, MouseButton)>;
pub type MouseReleaseCallback = Box<dyn Fn(&mut CallbackData, MouseButton)>;
pub type InternalStateChangeCallback = Box<dyn Fn(&mut CallbackData)>;
pub type InternalStateChangeCallback = Box<dyn Fn(&mut CallbackData, usize)>;
pub enum EventListener {
MouseEnter(MouseEnterCallback),
@@ -129,4 +133,4 @@ pub enum EventListener {
MousePress(MousePressCallback),
MouseRelease(MouseReleaseCallback),
InternalStateChange(InternalStateChangeCallback),
}
}

182
wgui/src/widget/mod.rs
View File

@@ -181,6 +181,33 @@ impl dyn WidgetObj {
}
}
macro_rules! call_event {
($self:ident, $widget_id:ident, $node_id:ident, $params:ident, $ev:ident, $cb_arg:expr) => {
for listener in &$self.event_listeners {
if let EventListener::$ev(callback) = listener {
let mut data = CallbackData {
obj: $self.obj.as_mut(),
widget_data: &mut $self.data,
widgets: $params.widgets,
animations: $params.animations,
dirty_nodes: $params.dirty_nodes,
$widget_id,
$node_id,
needs_redraw: false,
trigger_haptics: false,
};
callback(&mut data, $cb_arg);
if data.trigger_haptics {
*$params.trigger_haptics = true;
}
if data.needs_redraw {
*$params.needs_redraw = true;
}
}
}
};
}
impl WidgetState {
pub fn add_event_listener(&mut self, listener: EventListener) {
self.event_listeners.push(listener);
@@ -304,24 +331,16 @@ impl WidgetState {
) -> EventResult {
let hovered = event.test_mouse_within_transform(params.transform_stack.get());
// buttons don't need to be tracked separately as long as we stick to VR use.
let mut pressed_changed_button = None;
let mut hovered_changed = false;
match &event {
Event::MouseDown(e) => {
if hovered {
pressed_changed_button = self
.data
.set_device_pressed(e.device, true)
.then_some(e.button);
if hovered && self.data.set_device_pressed(e.device, true) {
call_event!(self, widget_id, node_id, params, MousePress, e.button);
}
}
Event::MouseUp(e) => {
pressed_changed_button = self
.data
.set_device_pressed(e.device, false)
.then_some(e.button);
if self.data.set_device_pressed(e.device, false) {
call_event!(self, widget_id, node_id, params, MouseRelease, e.button);
}
}
Event::MouseWheel(e) => {
if hovered && self.process_wheel(params, e) {
@@ -329,127 +348,30 @@ impl WidgetState {
}
}
Event::MouseMotion(e) => {
hovered_changed |= self.data.set_device_hovered(e.device, hovered);
if self.data.set_device_hovered(e.device, hovered) {
if self.data.is_hovered() {
call_event!(self, widget_id, node_id, params, MouseEnter, ());
} else {
call_event!(self, widget_id, node_id, params, MouseLeave, ());
}
}
}
Event::MouseLeave(e) => {
hovered_changed |= self.data.set_device_hovered(e.device, false);
}
_ => {}
}
for listener in &self.event_listeners {
match listener {
EventListener::MouseEnter(callback) => {
if hovered_changed && self.data.is_hovered() {
let mut data = CallbackData {
obj: self.obj.as_mut(),
widget_data: &mut self.data,
widgets: params.widgets,
animations: params.animations,
dirty_nodes: params.dirty_nodes,
widget_id,
node_id,
needs_redraw: false,
trigger_haptics: false,
};
callback(&mut data);
if data.trigger_haptics {
*params.trigger_haptics = true;
}
if data.needs_redraw {
*params.needs_redraw = true;
}
}
}
EventListener::MouseLeave(callback) => {
if hovered_changed && !self.data.is_hovered() {
let mut data = CallbackData {
obj: self.obj.as_mut(),
widget_data: &mut self.data,
widgets: params.widgets,
animations: params.animations,
dirty_nodes: params.dirty_nodes,
widget_id,
node_id,
needs_redraw: false,
trigger_haptics: false,
};
callback(&mut data);
if data.trigger_haptics {
*params.trigger_haptics = true;
}
if data.needs_redraw {
*params.needs_redraw = true;
}
}
}
EventListener::MousePress(callback) => {
if let Some(button) = pressed_changed_button.filter(|_| self.data.is_pressed()) {
let mut data = CallbackData {
obj: self.obj.as_mut(),
widget_data: &mut self.data,
widgets: params.widgets,
animations: params.animations,
dirty_nodes: params.dirty_nodes,
widget_id,
node_id,
needs_redraw: false,
trigger_haptics: false,
};
callback(&mut data, button);
if data.trigger_haptics {
*params.trigger_haptics = true;
}
if data.needs_redraw {
*params.needs_redraw = true;
}
}
}
EventListener::MouseRelease(callback) => {
if let Some(button) = pressed_changed_button.filter(|_| !self.data.is_pressed()) {
let mut data = CallbackData {
obj: self.obj.as_mut(),
widget_data: &mut self.data,
widgets: params.widgets,
animations: params.animations,
dirty_nodes: params.dirty_nodes,
widget_id,
node_id,
needs_redraw: false,
trigger_haptics: false,
};
callback(&mut data, button);
if data.trigger_haptics {
*params.trigger_haptics = true;
}
if data.needs_redraw {
*params.needs_redraw = true;
}
}
}
EventListener::InternalStateChange(callback) => {
let mut data = CallbackData {
obj: self.obj.as_mut(),
widget_data: &mut self.data,
widgets: params.widgets,
animations: params.animations,
dirty_nodes: params.dirty_nodes,
widget_id,
node_id,
needs_redraw: false,
trigger_haptics: false,
};
callback(&mut data);
if data.trigger_haptics {
*params.trigger_haptics = true;
}
if data.needs_redraw {
*params.needs_redraw = true;
}
if self.data.set_device_hovered(e.device, false) {
call_event!(self, widget_id, node_id, params, MouseLeave, ());
}
}
Event::InternalStateChange(e) => {
call_event!(
self,
widget_id,
node_id,
params,
InternalStateChange,
e.metadata
);
}
}
EventResult::Pass
}
}
}