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

simplify and optimize event states, deduplication

Browse Source
This commit is contained in:
Aleksander
2025-07-02 22:55:42 +02:00
parent 283d7fd64e
commit 92444bb5c4
7 changed files with 167 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,9 +159,7 @@ pub fn construct<U1, U2>(
rect_id,
EventListenerKind::MouseEnter,
Box::new(move |common, data, _, _| {
data
.animations
.push(anim_hover_in(button.clone(), data.widget_id));
common.animate(anim_hover_in(button.clone(), data.widget_id));
}),
);
@@ -170,9 +168,7 @@ pub fn construct<U1, U2>(
rect_id,
EventListenerKind::MouseLeave,
Box::new(move |common, data, _, _| {
data
.animations
.push(anim_hover_out(button.clone(), data.widget_id));
common.animate(anim_hover_out(button.clone(), data.widget_id));
}),
);

16
wgui/src/components/slider.rs
View File

@@ -93,8 +93,8 @@ fn anim_rect(rect: &mut Rectangle, pos: f32) {
drawing::Color::lerp(&HANDLE_BORDER_COLOR, &HANDLE_BORDER_COLOR_HOVERED, pos);
}
fn on_enter_anim(data: &mut event::CallbackData, handle_id: WidgetID) {
data.animations.push(Animation::new(
fn on_enter_anim(common: &mut event::CallbackDataCommon, handle_id: WidgetID) {
common.animate(Animation::new(
handle_id,
5,
AnimationEasing::OutQuad,
@@ -107,8 +107,8 @@ fn on_enter_anim(data: &mut event::CallbackData, handle_id: WidgetID) {
));
}
fn on_leave_anim(data: &mut event::CallbackData, handle_id: WidgetID) {
data.animations.push(Animation::new(
fn on_leave_anim(common: &mut event::CallbackDataCommon, handle_id: WidgetID) {
common.animate(Animation::new(
handle_id,
10,
AnimationEasing::OutQuad,
@@ -130,10 +130,10 @@ fn register_event_mouse_enter<U1, U2>(
listeners.add(
slider.body,
EventListenerKind::MouseEnter,
Box::new(move |common, data, _, _| {
Box::new(move |common, _data, _, _| {
common.trigger_haptics();
slider.get_state().hovered = true;
on_enter_anim(data, slider.slider_handle_rect_id);
on_enter_anim(common, slider.slider_handle_rect_id);
}),
);
}
@@ -145,10 +145,10 @@ fn register_event_mouse_leave<U1, U2>(
listeners.add(
slider.body,
EventListenerKind::MouseLeave,
Box::new(move |common, data, _, _| {
Box::new(move |common, _data, _, _| {
common.trigger_haptics();
slider.get_state().hovered = false;
on_leave_anim(data, slider.slider_handle_rect_id);
on_leave_anim(common, slider.slider_handle_rect_id);
}),
);
}