pogmommy/makima
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tiny refactor

Browse source
This commit is contained in:
cyber-sushi 2024-12-25 18:55:12 +01:00
parent e0750f97a6
commit d4f38d00ec
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/event_reader.rs
View file

@ -346,7 +346,7 @@ impl EventReader {
.device() .device()
.supported_keys() .supported_keys()
.unwrap_or(&evdev::AttributeSet::new()) .unwrap_or(&evdev::AttributeSet::new())
.contains(evdev::Key::BTN_TOOL_PEN); .contains(Key::BTN_TOOL_PEN);
let mut max_abs_wheel = 0; let mut max_abs_wheel = 0;
if let Ok(abs_state) = stream.device().get_abs_state() { if let Ok(abs_state) = stream.device().get_abs_state() {
for state in abs_state { for state in abs_state {
@ -1511,14 +1511,13 @@ impl EventReader {
if current_speed > speed as f32 { if current_speed > speed as f32 {
current_speed = speed as f32 current_speed = speed as f32
} }
if scroll_movement.0 != 0 {
let mut virt_dev = self.virt_dev.lock().await; let mut virt_dev = self.virt_dev.lock().await;
if scroll_movement.0 != 0 {
let virtual_event_x: InputEvent = let virtual_event_x: InputEvent =
InputEvent::new_now(EventType::RELATIVE, 12, scroll_movement.0 * current_speed as i32); InputEvent::new_now(EventType::RELATIVE, 12, scroll_movement.0 * current_speed as i32);
virt_dev.axis.emit(&[virtual_event_x]).unwrap(); virt_dev.axis.emit(&[virtual_event_x]).unwrap();
} }
if scroll_movement.1 != 0 { if scroll_movement.1 != 0 {
let mut virt_dev = self.virt_dev.lock().await;
let virtual_event_y: InputEvent = let virtual_event_y: InputEvent =
InputEvent::new_now(EventType::RELATIVE, 11, scroll_movement.1 * current_speed as i32); InputEvent::new_now(EventType::RELATIVE, 11, scroll_movement.1 * current_speed as i32);
virt_dev.axis.emit(&[virtual_event_y]).unwrap(); virt_dev.axis.emit(&[virtual_event_y]).unwrap();