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

grab with realign

Browse Source
This commit is contained in:
galister
2023-12-09 22:26:55 +01:00
parent 1842259e66
commit 6cfbc6ffcd
10 changed files with 289 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/overlays/keyboard.rs
View File

@@ -12,7 +12,7 @@ use std::{
use crate::{
backend::overlay::{OverlayData, OverlayState},
gui::{color_parse, CanvasBuilder, Control},
input::{KeyModifier, VirtualKey, KEYS_TO_MODS},
hid::{KeyModifier, VirtualKey, KEYS_TO_MODS},
state::AppState,
};
use glam::{vec2, vec3a};
@@ -129,7 +129,7 @@ fn key_press(
match control.state.as_mut() {
Some(KeyButtonData::Key { vk, pressed }) => {
data.key_click();
app.input.send_key(*vk as _, true);
app.hid_provider.send_key(*vk as _, true);
*pressed = true;
}
Some(KeyButtonData::Modifier {
@@ -140,13 +140,13 @@ fn key_press(
*sticky = data.modifiers & *modifier == 0;
data.modifiers |= *modifier;
data.key_click();
app.input.set_modifiers(data.modifiers);
app.hid_provider.set_modifiers(data.modifiers);
*pressed = true;
}
Some(KeyButtonData::Macro { verbs }) => {
data.key_click();
for (vk, press) in verbs {
app.input.send_key(*vk as _, *press);
app.hid_provider.send_key(*vk as _, *press);
}
}
Some(KeyButtonData::Exec { program, args }) => {
@@ -170,7 +170,7 @@ fn key_release(
) {
match control.state.as_mut() {
Some(KeyButtonData::Key { vk, pressed }) => {
app.input.send_key(*vk as _, false);
app.hid_provider.send_key(*vk as _, false);
*pressed = false;
}
Some(KeyButtonData::Modifier {
@@ -180,7 +180,7 @@ fn key_release(
}) => {
if !*sticky {
data.modifiers &= !*modifier;
app.input.set_modifiers(data.modifiers);
app.hid_provider.set_modifiers(data.modifiers);
*pressed = false;
}
}