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

context to use release → press; cleanups

Browse Source
This commit is contained in:
galister
2026-01-07 20:26:44 +09:00
parent 819313200b
commit 576506233e
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wlx-overlay-s/src/assets/gui/keyboard.xml
View File

@@ -88,10 +88,10 @@
<blueprint name="menu_app"> <blueprint name="menu_app">
<context_menu > <context_menu >
<!-- title text="${name}" /--> <!-- title text="${name}" /-->
<cell translation="BAR.TOGGLE_VISIBILITY" _release="::OverlayToggle ${name}" /> <cell translation="BAR.TOGGLE_VISIBILITY" _press="::OverlayToggle ${name}" />
<cell translation="BAR.RESET_POSITION" _release="::OverlayReset ${name}" /> <cell translation="BAR.RESET_POSITION" _press="::OverlayReset ${name}" />
<cell translation="BAR.CLOSE_APP" _release="::WvrOverlayTermProcess ${name}" /> <cell translation="BAR.CLOSE_APP" _press="::WvrOverlayTermProcess ${name}" />
<cell translation="BAR.FORCE_CLOSE_APP" _release="::WvrOverlayKillProcess ${name}" /> <cell translation="BAR.FORCE_CLOSE_APP" _press="::WvrOverlayKillProcess ${name}" />
</context_menu> </context_menu>
</blueprint> </blueprint>
@@ -123,9 +123,9 @@
<blueprint name="menu_panel"> <blueprint name="menu_panel">
<context_menu > <context_menu >
<!-- title text="${name}" /--> <!-- title text="${name}" /-->
<cell translation="BAR.TOGGLE_VISIBILITY" _release="::OverlayToggle ${name}" /> <cell translation="BAR.TOGGLE_VISIBILITY" _press="::OverlayToggle ${name}" />
<cell translation="BAR.RESET_POSITION" _release="::OverlayReset ${name}" /> <cell translation="BAR.RESET_POSITION" _press="::OverlayReset ${name}" />
<cell translation="BAR.RELOAD_FROM_DISK" _release="::CustomOverlayReload ${name}" /> <cell translation="BAR.RELOAD_FROM_DISK" _press="::CustomOverlayReload ${name}" />
</context_menu> </context_menu>
</blueprint> </blueprint>
@@ -138,9 +138,9 @@
<blueprint name="menu_mirror"> <blueprint name="menu_mirror">
<context_menu > <context_menu >
<!-- title text="${name}" /--> <!-- title text="${name}" /-->
<cell translation="BAR.TOGGLE_VISIBILITY" _release="::OverlayToggle ${name}" /> <cell translation="BAR.TOGGLE_VISIBILITY" _press="::OverlayToggle ${name}" />
<cell translation="BAR.RESET_POSITION" _release="::OverlayReset ${name}" /> <cell translation="BAR.RESET_POSITION" _press="::OverlayReset ${name}" />
<cell translation="BAR.CLOSE_MIRROR" _release="::OverlayDrop ${name}" /> <cell translation="BAR.CLOSE_MIRROR" _press="::OverlayDrop ${name}" />
</context_menu> </context_menu>
</blueprint> </blueprint>

3
wlx-overlay-s/src/gui/panel/button.rs
View File

@@ -222,7 +222,6 @@ pub(super) fn setup_custom_button<S: 'static>(
template_params.insert(attrib[PREFIX.len()..].into(), value.clone()); template_params.insert(attrib[PREFIX.len()..].into(), value.clone());
} }
} }
log::warn!("Context params: {template_params:?}");
let template_name: Rc<str> = template_name.into(); let template_name: Rc<str> = template_name.into();
let context_menu = context_menu.clone(); let context_menu = context_menu.clone();
@@ -333,8 +332,6 @@ pub(super) fn setup_custom_button<S: 'static>(
return; return;
}; };
log::warn!("{command} {arg}");
Box::new(move |_common, data, app, _| { Box::new(move |_common, data, app, _| {
if !test_button(data) || !test_duration(&button, app) { if !test_button(data) || !test_duration(&button, app) {
return Ok(EventResult::Pass); return Ok(EventResult::Pass);