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