From 240f16be827dbc21dee90047124f8308efae00d2 Mon Sep 17 00:00:00 2001
From: cmclark00 <cmclark00@gmail.com>
Date: Mon, 31 Mar 2025 13:46:44 -0400
Subject: [PATCH] Fix pause menu scrolling and gamepad navigation: - Remove
 fillViewport from ScrollView to allow proper scrolling - Add explicit
 scrollToSelectedItem calls in menu navigation - Ensure selected item is
 always visible when navigating with gamepad

---
 app/src/main/java/com/mintris/MainActivity.kt |  4 ++++
 app/src/main/res/layout/activity_main.xml     | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/mintris/MainActivity.kt b/app/src/main/java/com/mintris/MainActivity.kt
index 5acd71f..50821e2 100644
--- a/app/src/main/java/com/mintris/MainActivity.kt
+++ b/app/src/main/java/com/mintris/MainActivity.kt
@@ -1224,6 +1224,8 @@ class MainActivity : AppCompatActivity(),
         runOnUiThread {
             if (binding.pauseContainer.visibility == View.VISIBLE) {
                 moveMenuSelectionUp()
+                // Ensure the selected item is visible
+                scrollToSelectedItem()
             }
         }
     }
@@ -1232,6 +1234,8 @@ class MainActivity : AppCompatActivity(),
         runOnUiThread {
             if (binding.pauseContainer.visibility == View.VISIBLE) {
                 moveMenuSelectionDown()
+                // Ensure the selected item is visible
+                scrollToSelectedItem()
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a6d5481..f277400 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -305,7 +305,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/black"
-        android:gravity="center"
         android:orientation="vertical"
         android:visibility="gone">
 
@@ -314,6 +313,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:gravity="center"
+            android:layout_marginTop="32dp"
             android:layout_marginBottom="32dp">
 
             <TextView
@@ -336,17 +336,21 @@
         </LinearLayout>
 
         <ScrollView
+            android:id="@+id/pauseMenuScrollView"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:fillViewport="true">
+            android:scrollbars="none"
+            android:overScrollMode="never"
+            android:fillViewport="false">
             
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:gravity="center"
-                android:paddingTop="16dp">
+                android:paddingTop="16dp"
+                android:paddingBottom="32dp">
                 
                 <Button
                     android:id="@+id/pauseStartButton"