summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2023-09-25 23:58:26 +0200
committerCharles Lombardo <clombardo169@gmail.com>2023-09-26 00:10:58 +0200
commit38b939b2e991795a06ec4db35e2eb84e4d27cd16 (patch)
treee1b1c5356ab55f733a2d8ca0114bc0a30bb45078 /src
parentMerge pull request #11583 from t895/overlay-fix-2 (diff)
downloadyuzu-38b939b2e991795a06ec4db35e2eb84e4d27cd16.tar
yuzu-38b939b2e991795a06ec4db35e2eb84e4d27cd16.tar.gz
yuzu-38b939b2e991795a06ec4db35e2eb84e4d27cd16.tar.bz2
yuzu-38b939b2e991795a06ec4db35e2eb84e4d27cd16.tar.lz
yuzu-38b939b2e991795a06ec4db35e2eb84e4d27cd16.tar.xz
yuzu-38b939b2e991795a06ec4db35e2eb84e4d27cd16.tar.zst
yuzu-38b939b2e991795a06ec4db35e2eb84e4d27cd16.zip
Diffstat (limited to 'src')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt10
-rw-r--r--src/android/app/src/main/res/layout/activity_settings.xml2
2 files changed, 7 insertions, 5 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
index 4d2f2f604..ea26a21d0 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
@@ -181,12 +181,14 @@ class SettingsActivity : AppCompatActivity() {
private fun setInsets() {
ViewCompat.setOnApplyWindowInsetsListener(
binding.navigationBarShade
- ) { view: View, windowInsets: WindowInsetsCompat ->
+ ) { _: View, windowInsets: WindowInsetsCompat ->
val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
- val mlpShade = view.layoutParams as MarginLayoutParams
- mlpShade.height = barInsets.bottom
- view.layoutParams = mlpShade
+ // The only situation where we care to have a nav bar shade is when it's at the bottom
+ // of the screen where scrolling list elements can go behind it.
+ val mlpNavShade = binding.navigationBarShade.layoutParams as MarginLayoutParams
+ mlpNavShade.height = barInsets.bottom
+ binding.navigationBarShade.layoutParams = mlpNavShade
windowInsets
}
diff --git a/src/android/app/src/main/res/layout/activity_settings.xml b/src/android/app/src/main/res/layout/activity_settings.xml
index 8a026a30a..a187665f2 100644
--- a/src/android/app/src/main/res/layout/activity_settings.xml
+++ b/src/android/app/src/main/res/layout/activity_settings.xml
@@ -22,7 +22,7 @@
<View
android:id="@+id/navigation_bar_shade"
- android:layout_width="match_parent"
+ android:layout_width="0dp"
android:layout_height="1px"
android:background="@android:color/transparent"
android:clickable="false"