Magic-Mirror/ruffle-android
1
0
Fork 0
mirror of https://github.com/ruffle-rs/ruffle-android.git synced 2024-11-23 05:39:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

native: Remove custom resize method, rely on event loop (for now?)

Browse Source
This commit is contained in:
Nathan Adams 2024-03-14 00:10:55 +01:00 committed by TÖRÖK Attila
parent dd1b8882b2
commit a4ab39340c
3 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/ruffle/src/main/java/rs/ruffle/FullscreenNativeActivity.java
View File

@ -71,8 +71,6 @@ public class FullscreenNativeActivity extends GameActivity {
private native void keydown(byte key_code, char key_char); private native void keydown(byte key_code, char key_char);
private native void keyup(byte key_code, char key_char); private native void keyup(byte key_code, char key_char);
private native void resized();
private native void requestContextMenu(); private native void requestContextMenu();
private native void runContextMenuCallback(int index); private native void runContextMenuCallback(int index);
private native void clearContextMenu(); private native void clearContextMenu();
@ -182,10 +180,6 @@ public class FullscreenNativeActivity extends GameActivity {
layout.requestFocus(); layout.requestFocus();
this.mSurfaceView.getHolder().addCallback(this); this.mSurfaceView.getHolder().addCallback(this);
ViewCompat.setOnApplyWindowInsetsListener(this.mSurfaceView, this); ViewCompat.setOnApplyWindowInsetsListener(this.mSurfaceView, this);
this.mSurfaceView.addOnLayoutChangeListener((vw, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
resized();
});
} }
@Override @Override

2
native/src/custom_event.rs
View File

@ -1,7 +1,6 @@
//! Custom event type for Ruffle on Android //! Custom event type for Ruffle on Android
use ruffle_core::events::KeyCode; use ruffle_core::events::KeyCode;
use ruffle_core::ViewportDimensions;
/// User-defined events. /// User-defined events.
#[derive(Debug)] #[derive(Debug)]
@ -15,6 +14,5 @@ pub enum RuffleEvent {
}, },
RunContextMenuCallback(usize), RunContextMenuCallback(usize),
ClearContextMenu, ClearContextMenu,
Resize(ViewportDimensions),
RequestContextMenu, RequestContextMenu,
} }

26
native/src/lib.rs
View File

@ -367,12 +367,6 @@ fn run(app: AndroidApp) {
match receiver.try_recv() { match receiver.try_recv() {
Err(_) => {} Err(_) => {}
Ok(RuffleEvent::Resize(size)) => {
if let Some(player) = playerbox.as_ref() {
player.player.lock().unwrap().set_viewport_dimensions(size);
needs_redraw = true;
}
}
Ok(RuffleEvent::TaskPoll) => { Ok(RuffleEvent::TaskPoll) => {
if let Some(player) = playerbox.as_ref() { if let Some(player) = playerbox.as_ref() {
player player
@ -524,26 +518,6 @@ pub unsafe extern "C" fn Java_rs_ruffle_FullscreenNativeActivity_keyup(
}); });
} }
#[no_mangle]
#[allow(clippy::missing_safety_doc)]
pub unsafe extern "C" fn Java_rs_ruffle_FullscreenNativeActivity_resized(
mut env: JNIEnv,
this: JObject,
) {
let event_loop: MutexGuard<Sender<RuffleEvent>> =
env.get_rust_field(this, "eventLoopHandle").unwrap();
let size = get_view_size();
if let Ok((w, h)) = size {
let viewport_scale_factor = 1.0; //window.scale_factor();
let _ = event_loop.send(RuffleEvent::Resize(ViewportDimensions {
width: w as u32,
height: h as u32,
scale_factor: viewport_scale_factor,
}));
}
log::warn!("resized!");
}
pub fn get_jvm<'a>() -> Result<(jni::JavaVM, JObject<'a>), Box<dyn std::error::Error>> { pub fn get_jvm<'a>() -> Result<(jni::JavaVM, JObject<'a>), Box<dyn std::error::Error>> {
// Create a VM for executing Java calls // Create a VM for executing Java calls
let context = ndk_context::android_context(); let context = ndk_context::android_context();