Fix iOS layout editor orientation handling

J1coding · J1coding · commit 2af0564a767e · 2026-06-13T11:07:06.000+02:00
- Remove forced UIWindowScene.requestGeometryUpdate calls from the editor.
  The picker now selects which layout data is being edited, not which
  orientation the device should rotate to.

- Make the editor canvas adaptive to actual device geometry:
  landscape canvas when width &gt; height, portrait canvas otherwise.

- Initialize editLandscape from UIScreen.main.bounds on appear so the
  editor opens in the correct mode when the device is already landscape.

- Add a banner when the picker data mode differs from actual geometry,
  prompting the user to rotate for the full canvas.

- Fix editorPortraitContent to use editLandscape instead of hardcoded false,
  so landscape layout data is editable even in the portrait canvas.

- Remove the rotation-prompt overlay inside landscapeEditor; the body
  now handles geometry selection and the banner handles user guidance.
diff --git a/app/src/main/swift/Views/Settings/PadLayoutEditView.swift b/app/src/main/swift/Views/Settings/PadLayoutEditView.swift
@@ -21,11 +21,42 @@ struct PadLayoutEditView: View {
     @State private var originalSnapshot: PadLayoutSnapshot? = nil
 
     var body: some View {
-        Group {
-            if editLandscape {
-                landscapeEditor
-            } else {
-                portraitEditor
+        GeometryReader { geo in
+            let isActuallyLandscape = geo.size.width > geo.size.height
+            ZStack {
+                if isActuallyLandscape {
+                    landscapeEditorCanvas(width: geo.size.width, height: geo.size.height)
+                } else {
+                    portraitEditorCanvas(width: geo.size.width, height: geo.size.height)
+                }
+
+                // Banner when editing data for a different orientation than current geometry
+                if isActuallyLandscape != editLandscape {
+                    VStack {
+                        HStack(spacing: 6) {
+                            Image(systemName: "exclamationmark.triangle.fill")
+                            Text(editLandscape
+                                 ? "Editing landscape layout in portrait. Rotate device to landscape for full canvas."
+                                 : "Editing portrait layout in landscape. Rotate device to portrait for full canvas.")
+                                .font(.caption.weight(.semibold))
+                                .multilineTextAlignment(.center)
+                                .lineLimit(3)
+                        }
+                        .foregroundStyle(.yellow)
+                        .padding(.horizontal, 12)
+                        .padding(.vertical, 8)
+                        .background(.black.opacity(0.6), in: RoundedRectangle(cornerRadius: 8))
+                        Spacer()
+                    }
+                    .padding(.top, 50)
+                    .padding(.horizontal, 20)
+                    .allowsHitTesting(false)
+                }
+
+                VStack {
+                    compactToolbar
+                    Spacer()
+                }
             }
         }
         .navigationBarHidden(true)
@@ -35,108 +66,61 @@ struct PadLayoutEditView: View {
             if originalSnapshot == nil {
                 originalSnapshot = captureSnapshot()
             }
+            let bounds = UIScreen.main.bounds
+            editLandscape = bounds.width > bounds.height
         }
         .onDisappear {
             NSLog("@@PAD_LAYOUT@@ disappear")
             NotificationCenter.default.post(name: Notification.Name("ARMSX2iOSPadLayoutEditorDismissed"), object: nil)
         }
-        .onChange(of: editLandscape) { _, isLandscape in
-            if isLandscape {
-                requestOrientation(.landscape)
-            } else {
-                requestOrientation(.portrait)
-            }
-        }
     }
 
-    // MARK: - Landscape editor (full-screen overlay, prompts rotation if needed)
-    private var landscapeEditor: some View {
-        GeometryReader { geo in
-            let isActuallyLandscape = geo.size.width > geo.size.height
-            if isActuallyLandscape {
-                ZStack {
-                    Color.black.opacity(0.4)
-                        .allowsHitTesting(false)
-
-                    // Subtle safe zone guide
-                    let margin: CGFloat = 0.05
-                    let guideRect = CGRect(
-                        x: geo.size.width * margin,
-                        y: geo.size.height * margin,
-                        width: geo.size.width * (1 - margin * 2),
-                        height: geo.size.height * (1 - margin * 2)
-                    )
-                    Rectangle()
-                        .stroke(style: StrokeStyle(lineWidth: 1, dash: [6, 4]))
-                        .foregroundStyle(.yellow.opacity(0.3))
-                        .frame(width: guideRect.width, height: guideRect.height)
-                        .position(x: guideRect.midX, y: guideRect.midY)
-
-                    customSkinPreview(isLandscape: true, width: geo.size.width, height: geo.size.height)
-
-                    editorContent(areaW: geo.size.width, areaH: geo.size.height)
-
-                    VStack {
-                        compactToolbar
-                        Spacer()
-                    }
-                }
-                .contentShape(Rectangle())
-                .ignoresSafeArea()
-            } else {
-                // Device is still portrait — show rotation prompt
-                ZStack {
-                    Color.black
-
-                    VStack(spacing: 16) {
-                        Image(systemName: "rotate.right")
-                            .font(.system(size: 48))
-                            .foregroundStyle(.secondary)
-                        Text("Rotate your device to landscape to edit the landscape layout.")
-                            .font(.headline)
-                            .foregroundStyle(.secondary)
-                            .multilineTextAlignment(.center)
-                            .padding(.horizontal, 32)
-                    }
+    // MARK: - Landscape editor canvas (always shown when device is landscape)
+    private func landscapeEditorCanvas(width: CGFloat, height: CGFloat) -> some View {
+        ZStack {
+            Color.black.opacity(0.4)
+                .allowsHitTesting(false)
 
-                    VStack {
-                        compactToolbar
-                        Spacer()
-                    }
-                }
-                .ignoresSafeArea()
-            }
+            // Subtle safe zone guide
+            let margin: CGFloat = 0.05
+            let guideRect = CGRect(
+                x: width * margin,
+                y: height * margin,
+                width: width * (1 - margin * 2),
+                height: height * (1 - margin * 2)
+            )
+            Rectangle()
+                .stroke(style: StrokeStyle(lineWidth: 1, dash: [6, 4]))
+                .foregroundStyle(.yellow.opacity(0.3))
+                .frame(width: guideRect.width, height: guideRect.height)
+                .position(x: guideRect.midX, y: guideRect.midY)
+
+            customSkinPreview(isLandscape: true, width: width, height: height)
+
+            editorContent(areaW: width, areaH: height)
         }
+        .contentShape(Rectangle())
+        .ignoresSafeArea()
     }
 
-    // MARK: - Portrait editor (matches Phase 1 gameplay: top game area, bottom controller deck)
-    private var portraitEditor: some View {
-        GeometryReader { geo in
-            let gameHeight = min(geo.size.width * 3 / 4, geo.size.height * 0.55)
-            let padHeight = geo.size.height - gameHeight
-            ZStack {
-                VStack(spacing: 0) {
-                    // Top: game viewport area
-                    Color.black
-                        .allowsHitTesting(false)
-                        .frame(height: gameHeight)
-
-                    // Bottom: controller deck editing area
-                    ZStack {
-                        Color.black
-                        customSkinPreview(isLandscape: false, width: geo.size.width, height: padHeight)
-                        editorPortraitContent(areaW: geo.size.width, areaH: padHeight)
-                    }
-                    .frame(height: padHeight)
-                    .clipped()
-                }
+    // MARK: - Portrait editor canvas (always shown when device is portrait)
+    private func portraitEditorCanvas(width: CGFloat, height: CGFloat) -> some View {
+        let gameHeight = min(width * 3 / 4, height * 0.55)
+        let padHeight = height - gameHeight
+        VStack(spacing: 0) {
+            // Top: game viewport area
+            Color.black
+                .allowsHitTesting(false)
+                .frame(height: gameHeight)
 
-                VStack {
-                    compactToolbar
-                    Spacer()
-                }
+            // Bottom: controller deck editing area
+            ZStack {
+                Color.black
+                customSkinPreview(isLandscape: false, width: width, height: padHeight)
+                editorPortraitContent(areaW: width, areaH: padHeight)
             }
-            .contentShape(Rectangle())
+            .frame(height: padHeight)
+            .clipped()
         }
     }
 
@@ -307,11 +291,11 @@ struct PadLayoutEditView: View {
         ZStack {
             // Individual buttons for action and dpad
             ForEach(PadLayoutStore.perButtonIDs, id: \.self) { (id: String) in
-                DraggableButton(id: id, areaW: areaW, areaH: areaH, isLandscape: false, onBeginEdit: pushSnapshot)
+                DraggableButton(id: id, areaW: areaW, areaH: areaH, isLandscape: editLandscape, onBeginEdit: pushSnapshot)
             }
             // Group widgets for other controls
             ForEach(PadLayoutStore.groupIDs.filter { $0 != "action" && $0 != "dpad" }, id: \.self) { (id: String) in
-                DraggableGroup(id: id, areaW: areaW, areaH: areaH, isLandscape: false, onBeginEdit: pushSnapshot)
+                DraggableGroup(id: id, areaW: areaW, areaH: areaH, isLandscape: editLandscape, onBeginEdit: pushSnapshot)
             }
         }
         .environment(\.padSkin, settings.virtualPadSkin)
@@ -344,21 +328,6 @@ struct PadLayoutEditView: View {
     }
 }
 
-// MARK: - Orientation helper
-@MainActor
-private func requestOrientation(_ mask: UIInterfaceOrientationMask) {
-    if #available(iOS 16.0, *) {
-        for case let scene as UIWindowScene in UIApplication.shared.connectedScenes {
-            guard scene.activationState == .foregroundActive || scene.activationState == .foregroundInactive else { continue }
-            let preferences = UIWindowScene.GeometryPreferences.iOS(interfaceOrientations: mask)
-            scene.requestGeometryUpdate(preferences) { error in
-                NSLog("@@PAD_LAYOUT@@ orientation request failed: %@", error.localizedDescription)
-            }
-            break
-        }
-    }
-}
-
 // MARK: - Draggable group widget
 private struct DraggableGroup: View {
     let id: String
