migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-09-02 06:40:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #216 from MortimerGoro/android_compilation

Browse Source 
Fix Android compilation error
This commit is contained in:
tomaka
2017-07-07 07:26:47 +02:00
committed by GitHub
parent 90a81cca29 5ebeb8ab5f
commit aad82eb987
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "winit" name = "winit"
version = "0.7.1" version = "0.7.2"
authors = ["The winit contributors, Pierre Krieger <pierre.krieger1708@gmail.com>"] authors = ["The winit contributors, Pierre Krieger <pierre.krieger1708@gmail.com>"]
description = "Cross-platform window creation library." description = "Cross-platform window creation library."
keywords = ["windowing"] keywords = ["windowing"]

4
src/platform/android/mod.rs
View File

@@ -82,6 +82,7 @@ impl<'a> Iterator for PollEventsIterator<'a> {
}, },
location: (motion.x as f64, motion.y as f64), location: (motion.x as f64, motion.y as f64),
id: motion.pointer_id as u64, id: motion.pointer_id as u64,
device_id: DEVICE_ID,
})) }))
}, },
Ok(android_glue::Event::InitWindow) => { Ok(android_glue::Event::InitWindow) => {
@@ -273,3 +274,6 @@ impl WindowProxy {
android_glue::wake_event_loop(); android_glue::wake_event_loop();
} }
} }
// Constant device ID, to be removed when this backend is updated to report real device IDs.
const DEVICE_ID: ::DeviceId = ::DeviceId(DeviceId);