LOVE/love-android
1
0
Fork 0
mirror of https://github.com/love2d/love-android.git synced 2026-08-17 19:24:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix for the fix for the non-improvement

Browse Source
This commit is contained in:
fysx
2014-02-11 00:42:05 +01:00
parent 5e3579f680
commit 288a851a65
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jni/love/src/common/android.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ double getScreenScale()
if (result == -1.) { if (result == -1.) {
JNIEnv *env = (JNIEnv*) SDL_AndroidGetJNIEnv(); JNIEnv *env = (JNIEnv*) SDL_AndroidGetJNIEnv();
jclass activity = env->FindClass("org/libsdl/app/SDLActivity"); jclass activity = env->FindClass("org/love2d/android/GameActivity");
jmethodID getMetrics = env->GetStaticMethodID(activity, "getMetrics", "()Landroid/util/DisplayMetrics;"); jmethodID getMetrics = env->GetStaticMethodID(activity, "getMetrics", "()Landroid/util/DisplayMetrics;");
jobject metrics = env->CallStaticObjectMethod(activity, getMetrics); jobject metrics = env->CallStaticObjectMethod(activity, getMetrics);
src/org/libsdl/app/SDLActivity.java
-8
View File
@@ -12,7 +12,6 @@ import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.AbsoluteLayout; import android.widget.AbsoluteLayout;
import android.os.*; import android.os.*;
import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.graphics.*; import android.graphics.*;
import android.media.*; import android.media.*;
@@ -54,11 +53,6 @@ public class SDLActivity extends Activity {
System.loadLibrary("love"); System.loadLibrary("love");
} }
private static DisplayMetrics metrics = new DisplayMetrics();
public static DisplayMetrics getMetrics() {
return metrics;
}
// Setup // Setup
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@@ -85,8 +79,6 @@ public class SDLActivity extends Activity {
mLayout.addView(mSurface); mLayout.addView(mSurface);
setContentView(mLayout); setContentView(mLayout);
getWindowManager().getDefaultDisplay().getMetrics(metrics);
} }
// Events // Events
src/org/love2d/android/GameActivity.java
+10 -1
View File
@@ -2,10 +2,19 @@ package org.love2d.android;
import org.libsdl.app.SDLActivity; import org.libsdl.app.SDLActivity;
import android.os.Bundle; import android.os.Bundle;
import android.util.DisplayMetrics;
public class GameActivity extends SDLActivity { public class GameActivity extends SDLActivity {
@Override private static DisplayMetrics metrics = new DisplayMetrics();
@Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getWindowManager().getDefaultDisplay().getMetrics(metrics);
}
public static DisplayMetrics getMetrics() {
return metrics;
} }
} }