From 5807cf1b4ddc9d2b5a7d1db1178555181c00ad89 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Fri, 24 Mar 2023 04:21:09 -0400
Subject: [PATCH] android: Fix popup menu going out of bounds
---
.../yuzu_emu/activities/EmulationActivity.kt | 2 +-
.../src/main/res/layout/header_in_game.xml | 29 +++++++------------
2 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
index 0da7562a6..2fd0d38fa 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
@@ -96,7 +96,7 @@ open class EmulationActivity : AppCompatActivity() {
window.attributes.layoutInDisplayCutoutMode =
WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
- window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN or WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS)
+ window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
// It would be nice to use IMMERSIVE_STICKY, but that doesn't show the toolbar.
window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
diff --git a/src/android/app/src/main/res/layout/header_in_game.xml b/src/android/app/src/main/res/layout/header_in_game.xml
index 135d429c5..958cfb7e3 100644
--- a/src/android/app/src/main/res/layout/header_in_game.xml
+++ b/src/android/app/src/main/res/layout/header_in_game.xml
@@ -1,23 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<com.google.android.material.textview.MaterialTextView
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/text_game_title"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fitsSystemWindows="true">
-
- <com.google.android.material.textview.MaterialTextView
- android:id="@+id/text_game_title"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_margin="24dp"
- android:textAppearance="?attr/textAppearanceHeadlineMedium"
- android:textColor="?attr/colorOnSurface"
- android:textAlignment="viewStart"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="Super Mario Odyssey" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+ android:layout_height="wrap_content"
+ android:layout_marginTop="24dp"
+ android:layout_marginStart="24dp"
+ android:layout_marginEnd="24dp"
+ android:textAppearance="?attr/textAppearanceHeadlineMedium"
+ android:textColor="?attr/colorOnSurface"
+ android:textAlignment="viewStart"
+ tools:text="Super Mario Odyssey" />