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

1
uidev/assets/watch/controller.svg
View File

@@ -1 +0,0 @@
../../../wlx-overlay-s/src/assets/watch/controller.svg

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
}
}
}

16
wlx-overlay-s/src/assets/gui/watch.xml
View File

@@ -17,19 +17,19 @@
</theme>
<template name="Device">
<sprite color="~device_color" width="48" height="48" src="${src}" />
<sprite color="~device_color" width="${size}" height="${size}" src="${src}" />
</template>
<elements>
<div width="400" height="200">
<rectangle width="100%" height="100%" padding="4" box_sizing="content_box" flex_wrap="wrap" gap="16" color="~bg_color">
<div width="100%" flex_direction="row">
<Device src="watch/hmd.svg" />
<Device src="watch/controller.svg" />
<Device src="watch/controller.svg" />
<Device src="watch/track3.svg" />
<Device src="watch/track3.svg" />
<Device src="watch/track3.svg" />
<Device src="watch/hmd.svg" size="40" />
<Device src="watch/controller_l.svg" size="36" />
<Device src="watch/controller_r.svg" size="36" />
<Device src="watch/track3.svg" size="40" />
<Device src="watch/track3.svg" size="40" />
<Device src="watch/track3.svg" size="40" />
</div>
<div flex_direction="row">
<div id="clock_main" flex_direction="column" padding="4">
@@ -51,4 +51,4 @@
</rectangle>
</div>
</elements>
</layout>
</layout>

1
wlx-overlay-s/src/assets/watch/controller.svg
View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M11 18q-1.65 0-2.825-1.175T7 14q-2.5.025-4.25-1.737T1 8q0-.825.588-1.412T3 6h4V5H5V3h6v2H9v1h3.175q.4 0 .763.15t.637.425l8.375 8.375Q23 16 23 17.45t-1.05 2.5t-2.5 1.05t-2.5-1.05L15 18zm0-4H8.975q0 .825.588 1.413T11 16h2z"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 450 B

6
wlx-overlay-s/src/overlays/keyboard/builder.rs
View File

@@ -183,7 +183,7 @@ where
*widget_id,
EventListener::MouseEnter(Box::new({
let (k, kb) = (key_state.clone(), state.clone());
move |data| {
move |data, ()| {
data.trigger_haptics = true;
on_enter_anim(k.clone(), kb.clone(), data);
}
@@ -193,7 +193,7 @@ where
*widget_id,
EventListener::MouseLeave(Box::new({
let (k, kb) = (key_state.clone(), state.clone());
move |data| {
move |data, ()| {
data.trigger_haptics = true;
on_leave_anim(k.clone(), kb.clone(), data);
}
@@ -235,7 +235,7 @@ where
*widget_id,
EventListener::InternalStateChange(Box::new({
let (k, kb) = (key_state.clone(), state.clone());
move |data| {
move |data, _| {
if (kb.borrow().modifiers & modifier) != 0 {
on_press_anim(k.clone(), data);
} else {

15
wlx-overlay-s/src/overlays/keyboard/mod.rs
View File

@@ -6,7 +6,10 @@ use std::{
};
use vulkano::image::view::ImageView;
use wgui::{drawing, event::MouseButton};
use wgui::{
drawing,
event::{InternalStateChangeEvent, MouseButton},
};
use crate::{
backend::{
@@ -57,11 +60,13 @@ impl OverlayBackend for KeyboardBackend {
impl InteractionHandler for KeyboardBackend {
fn on_pointer(&mut self, app: &mut AppState, hit: &PointerHit, pressed: bool) {
self.panel.on_pointer(app, hit, pressed);
self.handle_invoke(app);
let _ = self
.panel
.layout
.push_event(&wgui::event::Event::InternalStateChange);
self.handle_invoke(app);
.push_event(&wgui::event::Event::InternalStateChange(
InternalStateChangeEvent { metadata: 0 },
));
}
fn on_scroll(&mut self, app: &mut AppState, hit: &PointerHit, delta_y: f32, delta_x: f32) {
self.panel.on_scroll(app, hit, delta_y, delta_x);
@@ -102,7 +107,9 @@ impl OverlayRenderer for KeyboardBackend {
self.panel.resume(app)?;
self.panel
.layout
.push_event(&wgui::event::Event::InternalStateChange)?;
.push_event(&wgui::event::Event::InternalStateChange(
InternalStateChangeEvent { metadata: 0 },
))?;
Ok(())
}
}