alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2025-01-11 13:31:29 +11:00
Code Issues Packages Projects Releases Wiki Activity

Document Android raw_window_handle requirements (#1749)

Browse source 
* Add docs describing raw_winow_handle on android

* Run cargo fmt

* Change raw_window_handle panic to give more info
This commit is contained in:
Brad 2020-10-29 16:23:46 -05:00 committed by GitHub
parent 33fb62bb25
commit be850e483a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -505,7 +505,7 @@ impl Window {
let a_native_window = if let Some(native_window) = ndk_glue::native_window().as_ref() { let a_native_window = if let Some(native_window) = ndk_glue::native_window().as_ref() {
unsafe { native_window.ptr().as_mut() as *mut _ as *mut _ } unsafe { native_window.ptr().as_mut() as *mut _ as *mut _ }
} else { } else {
panic!("native window null"); panic!("Cannot get the native window, it's null and will always be null before Event::Resumed and after Event::Suspended. Make sure you only call this function between those events.");
}; };
let mut handle = raw_window_handle::android::AndroidHandle::empty(); let mut handle = raw_window_handle::android::AndroidHandle::empty();
handle.a_native_window = a_native_window; handle.a_native_window = a_native_window;

6
src/window.rs
View file

@ -784,6 +784,12 @@ impl Window {
} }
unsafe impl raw_window_handle::HasRawWindowHandle for Window { unsafe impl raw_window_handle::HasRawWindowHandle for Window {
/// Returns a `raw_window_handle::RawWindowHandle` for the Window
///
/// ## Platform-specific
///
/// - **Android:** Only available after receiving the Resumed event and before Suspended. *If you*
/// *try to get the handle outside of that period, this function will panic*!
fn raw_window_handle(&self) -> raw_window_handle::RawWindowHandle { fn raw_window_handle(&self) -> raw_window_handle::RawWindowHandle {
self.window.raw_window_handle() self.window.raw_window_handle()
} }