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

Implement love.window.getSafeArea for Android

Browse Source 
--HG--
branch : android-safearea
This commit is contained in:
Miku AuahDark
2019-02-08 23:58:02 +08:00
parent 76917685dd
commit 4a08c0f7c1
3 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/android.cpp
+22
View File
@@ -90,6 +90,28 @@ double getScreenScale()
return result;
}
bool getSafeArea(int &top, int &left, int &bottom, int &right)
{
JNIEnv *env = (JNIEnv*) SDL_AndroidGetJNIEnv();
jobject activity = (jobject) SDL_AndroidGetActivity();
jclass clazz(env->GetObjectClass(activity));
jmethodID methodID = env->GetMethodID(clazz, "initializeSafeArea", "()Z");
bool hasSafeArea = false;
if ((hasSafeArea = env->CallBooleanMethod(activity, methodID)))
{
top = env->GetIntField(activity, env->GetFieldID(clazz, "safeAreaTop", "I"));
left = env->GetIntField(activity, env->GetFieldID(clazz, "safeAreaLeft", "I"));
bottom = env->GetIntField(activity, env->GetFieldID(clazz, "safeAreaBottom", "I"));
right = env->GetIntField(activity, env->GetFieldID(clazz, "safeAreaRight", "I"));
}
env->DeleteLocalRef(clazz);
env->DeleteLocalRef(activity);
return hasSafeArea;
}
const char *getSelectedGameFile()
{
static const char *path = NULL;
src/common/android.h
+6
View File
@@ -44,6 +44,12 @@ bool getImmersive();
**/
double getScreenScale();
/**
* Gets the window safe area, e.g. phone with notch display.
* Returns false if safe area is not set.
**/
bool getSafeArea(int &top, int &left, int &bottom, int &right);
/**
* Gets the selected love file in the device filesystem.
**/
src/modules/window/sdl/Window.cpp
+16 -1
View File
@@ -845,9 +845,24 @@ void Window::getPosition(int &x, int &y, int &displayindex)
Rect Window::getSafeArea() const
{
#ifdef LOVE_IOS
#if defined(LOVE_IOS)
if (window != nullptr)
return love::ios::getSafeArea(window);
#elif defined(LOVE_ANDROID)
if (window != nullptr)
{
int top, left, bottom, right;
if (love::android::getSafeArea(top, left, bottom, right))
{
// DisplayCutout API returns safe area in pixels
// and is affected by display orientation.
double safeLeft, safeTop, safeWidth, safeHeight;
fromPixels(left, top, safeLeft, safeTop);
fromPixels(pixelWidth - left - right, pixelHeight - top - bottom, safeWidth, safeHeight);
return {(int) safeLeft, (int) safeTop, (int) safeWidth, (int) safeHeight};
}
}
#endif
double dw, dh;