From 161f99b864795bf714941e981ad4032c6f50855e Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 12 Sep 2020 17:56:47 +0200 Subject: Android: Move OSD out of the way when menu is open https://bugs.dolphin-emu.org/issues/12256 --- .../main/java/org/dolphinemu/dolphinemu/NativeLibrary.java | 4 ++++ .../org/dolphinemu/dolphinemu/fragments/MenuFragment.java | 13 +++++++++++++ 2 files changed, 17 insertions(+) (limited to 'Source/Android/app/src/main/java') diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java index 86e75d55ec..a03376bb8a 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -431,6 +431,10 @@ public final class NativeLibrary public static native String FormatSize(long bytes, int decimals); + public static native void SetObscuredPixelsLeft(int width); + + public static native void SetObscuredPixelsTop(int height); + private static boolean alertResult = false; public static boolean displayAlertMsg(final String caption, final String text, diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java index f468240c4d..3badbd3e48 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java @@ -137,6 +137,11 @@ public final class MenuFragment extends Fragment implements View.OnClickListener mTitleText.setText(title); } + if (getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_LTR) + { + rootView.post(() -> NativeLibrary.SetObscuredPixelsLeft(rootView.getWidth())); + } + return rootView; } @@ -156,6 +161,14 @@ public final class MenuFragment extends Fragment implements View.OnClickListener options.findViewById(R.id.menu_emulation_load_root).setVisibility(savestateVisibility); } + @Override + public void onDestroyView() + { + super.onDestroyView(); + + NativeLibrary.SetObscuredPixelsLeft(0); + } + private void updatePauseUnpauseVisibility() { boolean paused = EmulationActivity.getHasUserPausedEmulation(); -- cgit v1.2.3