Add scrolling on-screen menu rails

Author: trekawek

android/app/src/main/java/eu/rekawek/coffeegb/android/MainActivity.java

@@ -52,8 +52,8 @@
 /** Canvas-menu and native external-surface client for {@link EmulationService}. */
 public final class MainActivity extends Activity implements RuntimeObserver {
 
-    private static final int STATE_MENU_MIN_SLOT = 0;
-    private static final int STATE_MENU_MAX_SLOT = 3;
+    private static final int STATE_MENU_MIN_SLOT = StateRef.MIN_SLOT;
+    private static final int STATE_MENU_MAX_SLOT = StateRef.MAX_SLOT;
 
     private static final int OPEN_ROM_REQUEST = 1;
     private static final int IMPORT_BATTERY_REQUEST = 2;
@@ -1805,12 +1805,7 @@ private MenuPreview statePreview(String preferredFocus) {
     }
 
     private MenuPageSpec statePage(MenuPreview preview, String preferredFocus) {
-        ArrayList<MenuPageSpec.Item> items = new ArrayList<>();
-        for (int index = STATE_MENU_MIN_SLOT; index <= STATE_MENU_MAX_SLOT; index++) {
-            // Every stable slot remains focusable in both modes. LOAD treats an empty or
-            // unavailable slot as a no-op; SAVE overwrites directly without confirmation.
-            items.add(new MenuPageSpec.Item("slot:" + index, "SLOT " + index, "", true));
-        }
+        List<MenuPageSpec.Item> items = stateMenuItems(stateSlots);
         String mode = stateMenuMode == StateMenuMode.SAVE ? "SAVE" : "LOAD";
         return new MenuPageSpec(MenuRoute.SAVE_STATES, "COFFEE GB", mode + " STATES", "", "",
                 stateSavedAtLines(stateSlot(preferredFocus == null
@@ -1820,6 +1815,30 @@ private MenuPageSpec statePage(MenuPreview preview, String preferredFocus) {
                 preferredFocus == null ? "slot:" + StateRef.MIN_SLOT : preferredFocus, preview);
     }
 
+    /** Stable state rows shared by SAVE and LOAD; persisted rows carry a visual-only seal hint. */
+    static List<MenuPageSpec.Item> stateMenuItems(List<AndroidStateSlot> catalog) {
+        ArrayList<MenuPageSpec.Item> items = new ArrayList<>();
+        for (int index = STATE_MENU_MIN_SLOT; index <= STATE_MENU_MAX_SLOT; index++) {
+            // Every stable slot remains focusable in both modes. LOAD treats an empty or
+            // unavailable slot as a no-op; SAVE overwrites directly without confirmation.
+            boolean used = catalogContainsLoadableSlot(catalog, index);
+            // The compositor uses this semantic marker to distinguish a persisted state from an
+            // empty but still focusable slot. It is intentionally not exposed as row copy.
+            items.add(new MenuPageSpec.Item("slot:" + index, "SLOT " + index,
+                    used ? "USED" : "", true));
+        }
+        return List.copyOf(items);
+    }
+
+    private static boolean catalogContainsLoadableSlot(List<AndroidStateSlot> catalog, int index) {
+        for (AndroidStateSlot slot : catalog) {
+            if (slot.index() == index && slot.loadable()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private static List<String> stateSavedAtLines(AndroidStateSlot slot) {
         String formatted = formatStateSavedAt(slot == null ? null : slot.savedAt());
         return formatted == null ? List.of() : List.of(formatted);

android/app/src/test/java/eu/rekawek/coffeegb/android/AndroidStateSlotTest.java

@@ -8,6 +8,7 @@
 import org.junit.Test;
 
 import java.time.Instant;
+import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -58,4 +59,21 @@ public void availableSlotCarriesItsValidatedCatalogSavedTime() {
         assertEquals(savedAt, slot.savedAt());
         assertTrue(MainActivity.formatStateSavedAt(savedAt).startsWith("SAVED "));
     }
+
+    @Test
+    public void stateMenuAlwaysExposesTenSlotsAndMarksOnlyPersistedRows() {
+        List<AndroidStateSlot> catalog = List.of(
+                AndroidStateSlot.from(0, null),
+                new AndroidStateSlot(7, "Slot 7: Saved", true, MenuPreview.empty(), null));
+
+        List<eu.rekawek.coffeegb.ui.menu.MenuPageSpec.Item> items =
+                MainActivity.stateMenuItems(catalog);
+
+        assertEquals(10, items.size());
+        assertEquals("slot:0", items.get(0).id());
+        assertEquals("slot:9", items.get(9).id());
+        assertEquals("", items.get(0).detail());
+        assertEquals("USED", items.get(7).detail());
+        assertTrue(items.stream().allMatch(eu.rekawek.coffeegb.ui.menu.MenuPageSpec.Item::enabled));
+    }
 }

swing/src/main/java/eu/rekawek/coffeegb/swing/SwingGui.kt

@@ -281,7 +281,11 @@ class SwingGui private constructor(
               if (::desktopActions.isInitialized) {
                 desktopActions.updatePortableStateSlots(
                     catalog.entries.filter { it.ref is eu.rekawek.coffeegb.controller.state.StateRef.Slot }
-                        .filter { (it.ref as eu.rekawek.coffeegb.controller.state.StateRef.Slot).index in 0..3 }
+                        .filter {
+                          (it.ref as eu.rekawek.coffeegb.controller.state.StateRef.Slot).index in
+                              eu.rekawek.coffeegb.controller.state.StateRef.MIN_SLOT..
+                                  eu.rekawek.coffeegb.controller.state.StateRef.MAX_SLOT
+                        }
                         .map { entry ->
                           val ref = entry.ref as eu.rekawek.coffeegb.controller.state.StateRef.Slot
                           val image = entry.thumbnail

swing/src/main/java/eu/rekawek/coffeegb/swing/SwingProposal3Menu.kt

@@ -366,14 +366,22 @@ internal class SwingProposal3Menu(
       }
 
       MenuRoute.SAVE_STATES -> {
+        val catalog = commands.stateSlots()
         val slots =
-            (0..3).map { slot ->
-              item("slot-$slot", "SLOT $slot", true)
+            (0..9).map { slot ->
+              // "USED" is presentation metadata only: the shared compositor turns it into the
+              // occupied-slot seal without showing legacy status text in the state list.
+              MenuPageSpec.Item(
+                  "slot-$slot",
+                  "SLOT $slot",
+                  if (catalog.firstOrNull { it.index == slot }?.loadable == true) "USED" else "",
+                  true,
+              )
             }
         val mode = if (stateMenuMode == StateMenuMode.SAVE) "SAVE" else "LOAD"
         val focused = stateFocusedItemId ?: "slot-0"
         val focusedSlot =
-            commands.stateSlots().firstOrNull { "slot-${it.index}" == focused }
+            catalog.firstOrNull { "slot-${it.index}" == focused }
         val preview =
             focusedSlot?.preview ?: MenuPreview.empty()
         val savedAt = portableStateSavedAt(focusedSlot?.savedAt)
@@ -630,7 +638,7 @@ internal class SwingProposal3Menu(
               }
               stateFocusedItemId = id
               if (stateMenuMode == StateMenuMode.LOAD) {
-                // The detached catalog is authoritative for the on-screen four-slot page.  Do not
+                // The detached catalog is authoritative for the on-screen ten-slot page.  Do not
                 // fall back to the desktop toolbar's separately selected slot while the catalog is
                 // loading or when this focused slot is empty.
                 if (commands.stateSlots().firstOrNull { it.index == slot }?.loadable == true) {

swing/src/test/java/eu/rekawek/coffeegb/swing/SwingProposal3MenuTest.kt

@@ -390,7 +390,7 @@ class SwingProposal3MenuTest {
   }
 
   @Test
-  fun `save page has four stable rows and A or Start saves directly while B returns`() {
+  fun `save page exposes ten slots and A or Start saves directly while B returns`() {
     val bridge = FakeBridge()
     val menu = newMenu(bridge)
 
@@ -406,15 +406,40 @@ class SwingProposal3MenuTest {
       press(menu, MenuKey.START)
       assertEquals(1, bridge.savedSlot)
 
-      repeat(2) { press(menu, MenuKey.DOWN) }
-      assertEquals("slot-3", menu.focusedItemIdForTest())
+      repeat(8) { press(menu, MenuKey.DOWN) }
+      assertEquals("slot-9", menu.focusedItemIdForTest())
+      press(menu, MenuKey.A)
+      assertEquals(9, bridge.savedSlot)
       press(menu, MenuKey.DOWN)
       assertEquals("slot-0", menu.focusedItemIdForTest())
       press(menu, MenuKey.B)
       assertEquals(MenuRoute.PAUSE_CONSOLE, menu.routeForTest())
     }
   }
 
+  @Test
+  fun `load page reaches a persisted slot nine`() {
+    val bridge =
+        FakeBridge().also {
+          it.stateCatalog = listOf(PortableMenuStateSlot(9, true, MenuPreview.empty()))
+        }
+    val menu = newMenu(bridge)
+
+    javax.swing.SwingUtilities.invokeAndWait {
+      press(menu, MenuKey.DOWN)
+      press(menu, MenuKey.DOWN)
+      press(menu, MenuKey.A)
+      assertEquals(MenuRoute.SAVE_STATES, menu.routeForTest())
+
+      repeat(9) { press(menu, MenuKey.DOWN) }
+      assertEquals("slot-9", menu.focusedItemIdForTest())
+      press(menu, MenuKey.A)
+    }
+
+    assertEquals(9, bridge.loadedSlot)
+    assertFalse(menu.visible())
+  }
+
   @Test
   fun `physical controller state routes and actions are marshalled to the EDT`() {
     val saveBridge = FakeBridge()

ui-portable/src/main/java/eu/rekawek/coffeegb/ui/menu/MenuPages.java

@@ -143,7 +143,13 @@ static MenuPage statePage(boolean load) {
                         item("slot-0", "SLOT 0"),
                         item("slot-1", "SLOT 1"),
                         item("slot-2", "SLOT 2"),
-                        item("slot-3", "SLOT 3")),
+                        item("slot-3", "SLOT 3"),
+                        item("slot-4", "SLOT 4"),
+                        item("slot-5", "SLOT 5"),
+                        item("slot-6", "SLOT 6"),
+                        item("slot-7", "SLOT 7"),
+                        item("slot-8", "SLOT 8"),
+                        item("slot-9", "SLOT 9")),
                 1, List.of("D-PAD MOVE", "A " + (load ? "LOAD" : "SAVE"), "B BACK"),
                 "slot-0", MenuPreview.empty());
     }