Fix portrait controller layout and touch targets

- Portrait gameplay now uses a VStack with a top game viewport and a bottom
  controller deck, instead of full-screen game with overlay.
- Game viewport height is min(width * 3/4, height * 0.55) for aspect-correct
  sizing while keeping the controller deck usable.
- Portrait no longer blanket-ignores safe area; top safe area is respected so
  OSD text stays below the Dynamic Island. Bottom safe area is ignored so
  controller buttons remain usable near the home indicator.
- Menu button is placed via .overlay(alignment: .topTrailing) in portrait.
- PSBtn and PadBtn now have a minimum 55x55 pt touch target regardless of
  visual skin size. The UIKitPadPressSurface UIButton and the DragGesture
  both cover the expanded target while the visual button stays unchanged.
- PadLayoutStore gains resetAll() which resets both portrait and landscape
  group positions and all per-button overrides. Visibility is not reset.
- PadLayoutEditView Reset All button calls resetAll() so it correctly resets
  both orientations and per-button positions. Undo and Cancel still work.

Author: J1coding

app/src/main/swift/Models/PadLayoutStore.swift

@@ -338,4 +338,13 @@ final class PadLayoutStore: @unchecked Sendable {
             }
         }
     }
+
+    func resetAll() {
+        portrait = Self.defaultPortrait
+        landscape = Self.defaultLandscape
+        perButtonPortrait.removeAll()
+        perButtonLandscape.removeAll()
+        // Note: controlVisibility is intentionally NOT reset here.
+        // Use resetControlVisibility() for that.
+    }
 }

app/src/main/swift/Views/GameScreenView.swift

@@ -86,17 +86,32 @@ struct GameScreenView: View {
                     }
                     .ignoresSafeArea()
                 } else {
-                    // Portrait: full-screen game with controller overlay at bottom.
-                    ZStack {
+                    // Portrait: top game viewport, bottom controller deck.
+                    // Game respects the top safe area so OSD stays below the Dynamic Island.
+                    // Controller ignores the bottom safe area so buttons remain usable near the home indicator.
+                    VStack(spacing: 0) {
+                        let gameHeight = min(geo.size.width * 3 / 4, geo.size.height * 0.55)
                         MetalGameView()
+                            .frame(height: gameHeight)
+                            .clipped()
+
                         if effectiveVirtualPadVisible {
-                            VirtualControllerView()
-                                .frame(height: geo.size.height / 2)
-                                .frame(maxHeight: .infinity, alignment: .bottom)
+                            ZStack {
+                                Color.black
+                                VirtualControllerView()
+                                    .frame(maxWidth: .infinity, maxHeight: .infinity)
+                            }
+                            .frame(maxWidth: .infinity, maxHeight: .infinity)
                         }
-                        menuButtonOverlay(isLandscape: false)
                     }
-                    .ignoresSafeArea()
+                    .overlay(alignment: .topTrailing) {
+                        if !menuButtonHidden {
+                            menuButton()
+                                .padding(.top, 4)
+                                .padding(.trailing, 4)
+                        }
+                    }
+                    .ignoresSafeArea(.container, edges: .bottom)
                 }
             }
             .preference(key: GameScreenSizePreferenceKey.self, value: geo.size)

app/src/main/swift/Views/Settings/PadLayoutEditView.swift

@@ -252,7 +252,7 @@ struct PadLayoutEditView: View {
 
             Button("Reset All") {
                 pushSnapshot()
-                layout.reset(isLandscape: isLandscape)
+                layout.resetAll()
             }
             .font(.caption)
             .foregroundStyle(.red.opacity(0.7))

app/src/main/swift/Views/VirtualControllerView.swift

@@ -917,23 +917,33 @@ struct PSBtn: View {
     @Environment(\.padSkin) private var padSkin
     @Environment(\.padUsesFullSkin) private var padUsesFullSkin
 
+    private var touchTarget: CGFloat { max(sz, 55) }
+
     var body: some View {
-        Group {
-            if ARMSX2UsesUIKitPadPressSurface() {
+        if ARMSX2UsesUIKitPadPressSurface() {
+            ZStack {
                 UIKitPadPressSurface(onPress: updatePressed) {
                     buttonFace
+                        .frame(width: sz, height: sz)
                 }
-            } else {
+                .frame(width: touchTarget, height: touchTarget)
+            }
+            .frame(width: touchTarget, height: touchTarget)
+            .opacity(padUsesFullSkin ? 1.0 : padOpacity)
+            .animation(.easeOut(duration: 0.06), value: on)
+        } else {
+            ZStack {
                 buttonFace
-                    .contentShape(Circle())
-                    .simultaneousGesture(DragGesture(minimumDistance: 0)
-                        .onChanged { _ in updatePressed(true) }
-                        .onEnded { _ in updatePressed(false) })
+                    .frame(width: sz, height: sz)
             }
+            .frame(width: touchTarget, height: touchTarget)
+            .contentShape(Rectangle())
+            .opacity(padUsesFullSkin ? 1.0 : padOpacity)
+            .animation(.easeOut(duration: 0.06), value: on)
+            .simultaneousGesture(DragGesture(minimumDistance: 0)
+                .onChanged { _ in updatePressed(true) }
+                .onEnded { _ in updatePressed(false) })
         }
-        .frame(width: sz, height: sz)
-        .opacity(padUsesFullSkin ? 1.0 : padOpacity)
-        .animation(.easeOut(duration: 0.06), value: on)
     }
 
     private var buttonFace: some View {
@@ -981,23 +991,34 @@ struct PadBtn: View {
     @Environment(\.padSkin) private var padSkin
     @Environment(\.padUsesFullSkin) private var padUsesFullSkin
 
+    private var touchW: CGFloat { max(w, 55) }
+    private var touchH: CGFloat { max(h, 55) }
+
     var body: some View {
-        Group {
-            if ARMSX2UsesUIKitPadPressSurface() {
+        if ARMSX2UsesUIKitPadPressSurface() {
+            ZStack {
                 UIKitPadPressSurface(onPress: updatePressed) {
                     buttonFace
+                        .frame(width: w, height: h)
                 }
-            } else {
+                .frame(width: touchW, height: touchH)
+            }
+            .frame(width: touchW, height: touchH)
+            .opacity(padUsesFullSkin ? 1.0 : padOpacity)
+            .animation(.easeOut(duration: 0.06), value: on)
+        } else {
+            ZStack {
                 buttonFace
-                    .contentShape(Rectangle())
-                    .simultaneousGesture(DragGesture(minimumDistance: 0)
-                        .onChanged { _ in updatePressed(true) }
-                        .onEnded { _ in updatePressed(false) })
+                    .frame(width: w, height: h)
             }
+            .frame(width: touchW, height: touchH)
+            .contentShape(Rectangle())
+            .opacity(padUsesFullSkin ? 1.0 : padOpacity)
+            .animation(.easeOut(duration: 0.06), value: on)
+            .simultaneousGesture(DragGesture(minimumDistance: 0)
+                .onChanged { _ in updatePressed(true) }
+                .onEnded { _ in updatePressed(false) })
         }
-        .frame(width: w, height: h)
-        .opacity(padUsesFullSkin ? 1.0 : padOpacity)
-        .animation(.easeOut(duration: 0.06), value: on)
     }
 
     private var buttonFace: some View {