leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make DeviceId contain device id's on Android

Browse source
This commit is contained in:
Fredrik Fornwall 2023-10-03 23:23:18 +02:00 • committed by GitHub
parent 8393d98940
commit c7cf0cfd83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -26,6 +26,7 @@ And please only add new entries to the top of this list, right below the `# Unre
- On X11, fix event loop not waking up on `ControlFlow::Poll` and `ControlFlow::WaitUntil`. - On X11, fix event loop not waking up on `ControlFlow::Poll` and `ControlFlow::WaitUntil`.
- **Breaking:** Change default `ControlFlow` from `Poll` to `Wait`. - **Breaking:** Change default `ControlFlow` from `Poll` to `Wait`.
- **Breaking:** remove `DeviceEvent::Text`. - **Breaking:** remove `DeviceEvent::Text`.
- On Android, fix `DeviceId` to contain device id's.
# 0.29.1-beta # 0.29.1-beta

8
src/platform_impl/android/mod.rs
View file

@ -387,7 +387,7 @@ impl<T: 'static> EventLoop<T> {
match event { match event {
InputEvent::MotionEvent(motion_event) => { InputEvent::MotionEvent(motion_event) => {
let window_id = window::WindowId(WindowId); let window_id = window::WindowId(WindowId);
let device_id = event::DeviceId(DeviceId); let device_id = event::DeviceId(DeviceId(motion_event.device_id()));
let phase = match motion_event.action() { let phase = match motion_event.action() {
MotionAction::Down | MotionAction::PointerDown => { MotionAction::Down | MotionAction::PointerDown => {
@ -459,7 +459,7 @@ impl<T: 'static> EventLoop<T> {
let event = event::Event::WindowEvent { let event = event::Event::WindowEvent {
window_id: window::WindowId(WindowId), window_id: window::WindowId(WindowId),
event: event::WindowEvent::KeyboardInput { event: event::WindowEvent::KeyboardInput {
device_id: event::DeviceId(DeviceId), device_id: event::DeviceId(DeviceId(key.device_id())),
event: event::KeyEvent { event: event::KeyEvent {
state, state,
physical_key: keycodes::to_physical_keycode(keycode), physical_key: keycodes::to_physical_keycode(keycode),
@ -739,11 +739,11 @@ impl From<u64> for WindowId {
} }
#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)] #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
pub struct DeviceId; pub struct DeviceId(i32);
impl DeviceId { impl DeviceId {
pub const fn dummy() -> Self { pub const fn dummy() -> Self {
DeviceId DeviceId(0)
} }
} }