kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

backend: make input device properties readable

Browse source
This commit is contained in:
Julian Orth 2024-03-12 16:16:21 +01:00
parent 8cd28dd3bf
commit 813f87faaa
6 changed files with 232 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/backends/metal/input.rs
View file

@ -149,13 +149,21 @@ impl MetalBackend {
InputEvent::Axis120 {
dist: scroll as _,
axis,
inverted: dev.natural_scrolling.get(),
inverted: dev
.effective
.natural_scrolling_enabled
.get()
.unwrap_or_default(),
}
} else {
InputEvent::AxisPx {
dist: Fixed::from_f64(scroll),
axis,
inverted: dev.natural_scrolling.get(),
inverted: dev
.effective
.natural_scrolling_enabled
.get()
.unwrap_or_default(),
}
};
dev.event(ie);

12
src/backends/metal/monitor.rs
View file

@ -287,17 +287,11 @@ impl MetalBackend {
events: Default::default(),
cb: Default::default(),
name: Default::default(),
natural_scrolling: Default::default(),
pressed_keys: Default::default(),
pressed_buttons: Default::default(),
left_handed: Default::default(),
accel_profile: Default::default(),
accel_speed: Default::default(),
desired: Default::default(),
transform_matrix: Default::default(),
tap_enabled: Default::default(),
drag_enabled: Default::default(),
drag_lock_enabled: Default::default(),
natural_scrolling_enabled: Default::default(),
effective: Default::default(),
});
slots[slot] = Some(dev.clone());
self.device_holder
@ -337,8 +331,6 @@ impl MetalBackend {
};
inputdev.device().set_slot(slot);
dev.name.set(Rc::new(inputdev.device().name()));
dev.natural_scrolling
.set(inputdev.device().natural_scrolling_enabled());
dev.inputdev.set(Some(inputdev));
dev.apply_config();
slf.state