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

fix some button actions missing filters

Browse Source
This commit is contained in:
galister
2026-01-12 12:17:30 +09:00
parent 91bc46defe
commit 0e004e7b3f
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wayvr/src/gui/panel/button.rs
View File

@@ -48,7 +48,7 @@ pub const BUTTON_EVENTS: [(
"_press", "_press",
EventListenerKind::MousePress, EventListenerKind::MousePress,
button_any, button_any,
short_duration, ignore_duration,
), ),
( (
"_release", "_release",
@@ -228,7 +228,11 @@ pub(super) fn setup_custom_button<S: 'static>(
let on_custom_attribs = on_custom_attribs.clone(); let on_custom_attribs = on_custom_attribs.clone();
Box::new({ Box::new({
move |_common, data, _app, _| { move |_common, data, app, _| {
if !test_button(data) || !test_duration(&button, app) {
return Ok(EventResult::Pass);
}
context_menu.borrow_mut().open(OpenParams { context_menu.borrow_mut().open(OpenParams {
on_custom_attribs: Some(on_custom_attribs.clone()), on_custom_attribs: Some(on_custom_attribs.clone()),
blueprint: Blueprint::Template { blueprint: Blueprint::Template {
@@ -244,7 +248,11 @@ pub(super) fn setup_custom_button<S: 'static>(
"::ContextMenuClose" => { "::ContextMenuClose" => {
let context_menu = context_menu.clone(); let context_menu = context_menu.clone();
Box::new(move |_common, _data, _app, _| { Box::new(move |_common, data, app, _| {
if !test_button(data) || !test_duration(&button, app) {
return Ok(EventResult::Pass);
}
context_menu.borrow_mut().close(); context_menu.borrow_mut().close();
Ok(EventResult::Consumed) Ok(EventResult::Consumed)
@@ -274,7 +282,11 @@ pub(super) fn setup_custom_button<S: 'static>(
} }
}; };
Box::new(move |common, _data, _app, _| { Box::new(move |common, data, app, _| {
if !test_button(data) || !test_duration(&button, app) {
return Ok(EventResult::Pass);
}
common common
.alterables .alterables
.set_style(widget_id, StyleSetRequest::Display(display)); .set_style(widget_id, StyleSetRequest::Display(display));