Fix iOS virtual controller layout editing

J1coding · J1coding · commit 2dd892ecbc09 · 2026-06-12T16:36:03.000+02:00
diff --git a/app/src/main/swift/Models/PadLayoutStore.swift b/app/src/main/swift/Models/PadLayoutStore.swift
@@ -154,15 +154,21 @@ final class PadLayoutStore: @unchecked Sendable {
 
     func setControlVisible(_ id: String, visible: Bool) {
         if visible {
-            controlVisibility.removeValue(forKey: id)
+            let group = groupID(for: id)
+            if id == group {
+                controlVisibility.removeValue(forKey: id)
+            } else if let groupVisible = controlVisibility[group], !groupVisible {
+                controlVisibility[id] = true
+            } else {
+                controlVisibility.removeValue(forKey: id)
+            }
         } else {
             controlVisibility[id] = false
         }
     }
 
     func resetControlVisibility() {
         controlVisibility.removeAll()
-        save()
     }
 
     // MARK: - INI persistence
@@ -180,17 +186,25 @@ final class PadLayoutStore: @unchecked Sendable {
                 ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/Landscape", key: "\(id)_scale", value: Float(pos.scale))
             }
         }
-        // Per-button positions are only written if they have been moved by the user.
+        // Per-button positions: write override if present, sentinel -1 otherwise.
         for id in Self.perButtonIDs {
             if let pos = perButtonPortrait[id] {
                 ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_x", value: Float(pos.x))
                 ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_y", value: Float(pos.y))
                 ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_scale", value: Float(pos.scale))
+            } else {
+                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_x", value: -1.0)
+                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_y", value: -1.0)
+                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_scale", value: -1.0)
             }
             if let pos = perButtonLandscape[id] {
                 ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_x", value: Float(pos.x))
                 ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_y", value: Float(pos.y))
                 ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_scale", value: Float(pos.scale))
+            } else {
+                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_x", value: -1.0)
+                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_y", value: -1.0)
+                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_scale", value: -1.0)
             }
         }
         // Visibility: `0` = hidden, `1` = visible. Absent means visible (default).
@@ -291,12 +305,10 @@ final class PadLayoutStore: @unchecked Sendable {
 
     func resetPortrait() {
         portrait = Self.defaultPortrait
-        save()
     }
 
     func resetLandscape() {
         landscape = Self.defaultLandscape
-        save()
     }
 
     func reset(isLandscape: Bool) {
@@ -307,38 +319,23 @@ final class PadLayoutStore: @unchecked Sendable {
         if isLandscape {
             for id in ["triangle", "circle", "square", "cross"] {
                 perButtonLandscape.removeValue(forKey: id)
-                // Overwrite INI keys with sentinel so stale keys do not reload after restart.
-                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_x", value: -1.0)
-                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_y", value: -1.0)
-                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_scale", value: -1.0)
             }
         } else {
             for id in ["triangle", "circle", "square", "cross"] {
                 perButtonPortrait.removeValue(forKey: id)
-                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_x", value: -1.0)
-                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_y", value: -1.0)
-                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_scale", value: -1.0)
             }
         }
-        save()
     }
 
     func resetPerButtonDPad(isLandscape: Bool) {
         if isLandscape {
             for id in ["up", "down", "left", "right"] {
                 perButtonLandscape.removeValue(forKey: id)
-                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_x", value: -1.0)
-                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_y", value: -1.0)
-                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_scale", value: -1.0)
             }
         } else {
             for id in ["up", "down", "left", "right"] {
                 perButtonPortrait.removeValue(forKey: id)
-                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_x", value: -1.0)
-                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_y", value: -1.0)
-                ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_scale", value: -1.0)
             }
         }
-        save()
     }
 }
diff --git a/app/src/main/swift/Views/GameScreenView.swift b/app/src/main/swift/Views/GameScreenView.swift
@@ -96,6 +96,7 @@ struct GameScreenView: View {
                         }
                         menuButtonOverlay(isLandscape: false)
                     }
+                    .ignoresSafeArea()
                 }
             }
             .preference(key: GameScreenSizePreferenceKey.self, value: geo.size)
diff --git a/app/src/main/swift/Views/Settings/PadLayoutEditView.swift b/app/src/main/swift/Views/Settings/PadLayoutEditView.swift
@@ -535,8 +535,7 @@ private struct DraggableButton: View {
     }
 
     var body: some View {
-        let groupID = layout.groupID(for: id)
-        let isVisible = layout.isControlVisible(groupID)
+        let isVisible = layout.isControlVisible(id)
         ZStack {
             RoundedRectangle(cornerRadius: 6)
                 .fill(.white.opacity(0.05))

Original file line number	Diff line number	Diff line change
`@@ -154,15 +154,21 @@ final class PadLayoutStore: @unchecked Sendable {`
`154`	`154`
`155`	`155`	`func setControlVisible(_ id: String, visible: Bool) {`
`156`	`156`	`if visible {`
`157`		`- controlVisibility.removeValue(forKey: id)`
	`157`	`+ let group = groupID(for: id)`
	`158`	`+ if id == group {`
	`159`	`+ controlVisibility.removeValue(forKey: id)`
	`160`	`+ } else if let groupVisible = controlVisibility[group], !groupVisible {`
	`161`	`+ controlVisibility[id] = true`
	`162`	`+ } else {`
	`163`	`+ controlVisibility.removeValue(forKey: id)`
	`164`	`+ }`
`158`	`165`	`} else {`
`159`	`166`	`controlVisibility[id] = false`
`160`	`167`	`}`
`161`	`168`	`}`
`162`	`169`
`163`	`170`	`func resetControlVisibility() {`
`164`	`171`	`controlVisibility.removeAll()`
`165`		`- save()`
`166`	`172`	`}`
`167`	`173`
`168`	`174`	`// MARK: - INI persistence`
`@@ -180,17 +186,25 @@ final class PadLayoutStore: @unchecked Sendable {`
`180`	`186`	`ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/Landscape", key: "\(id)_scale", value: Float(pos.scale))`
`181`	`187`	`}`
`182`	`188`	`}`
`183`		`- // Per-button positions are only written if they have been moved by the user.`
	`189`	`+ // Per-button positions: write override if present, sentinel -1 otherwise.`
`184`	`190`	`for id in Self.perButtonIDs {`
`185`	`191`	`if let pos = perButtonPortrait[id] {`
`186`	`192`	`ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_x", value: Float(pos.x))`
`187`	`193`	`ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_y", value: Float(pos.y))`
`188`	`194`	`ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_scale", value: Float(pos.scale))`
	`195`	`+ } else {`
	`196`	`+ ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_x", value: -1.0)`
	`197`	`+ ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_y", value: -1.0)`
	`198`	`+ ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_scale", value: -1.0)`
`189`	`199`	`}`
`190`	`200`	`if let pos = perButtonLandscape[id] {`
`191`	`201`	`ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_x", value: Float(pos.x))`
`192`	`202`	`ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_y", value: Float(pos.y))`
`193`	`203`	`ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_scale", value: Float(pos.scale))`
	`204`	`+ } else {`
	`205`	`+ ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_x", value: -1.0)`
	`206`	`+ ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_y", value: -1.0)`
	`207`	`+ ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_scale", value: -1.0)`
`194`	`208`	`}`
`195`	`209`	`}`
`196`	`210`	// Visibility: `0` = hidden, `1` = visible. Absent means visible (default).
`@@ -291,12 +305,10 @@ final class PadLayoutStore: @unchecked Sendable {`
`291`	`305`
`292`	`306`	`func resetPortrait() {`
`293`	`307`	`portrait = Self.defaultPortrait`
`294`		`- save()`
`295`	`308`	`}`
`296`	`309`
`297`	`310`	`func resetLandscape() {`
`298`	`311`	`landscape = Self.defaultLandscape`
`299`		`- save()`
`300`	`312`	`}`
`301`	`313`
`302`	`314`	`func reset(isLandscape: Bool) {`
`@@ -307,38 +319,23 @@ final class PadLayoutStore: @unchecked Sendable {`
`307`	`319`	`if isLandscape {`
`308`	`320`	`for id in ["triangle", "circle", "square", "cross"] {`
`309`	`321`	`perButtonLandscape.removeValue(forKey: id)`
`310`		`- // Overwrite INI keys with sentinel so stale keys do not reload after restart.`
`311`		`- ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_x", value: -1.0)`
`312`		`- ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_y", value: -1.0)`
`313`		`- ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_scale", value: -1.0)`
`314`	`322`	`}`
`315`	`323`	`} else {`
`316`	`324`	`for id in ["triangle", "circle", "square", "cross"] {`
`317`	`325`	`perButtonPortrait.removeValue(forKey: id)`
`318`		`- ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_x", value: -1.0)`
`319`		`- ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_y", value: -1.0)`
`320`		`- ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_scale", value: -1.0)`
`321`	`326`	`}`
`322`	`327`	`}`
`323`		`- save()`
`324`	`328`	`}`
`325`	`329`
`326`	`330`	`func resetPerButtonDPad(isLandscape: Bool) {`
`327`	`331`	`if isLandscape {`
`328`	`332`	`for id in ["up", "down", "left", "right"] {`
`329`	`333`	`perButtonLandscape.removeValue(forKey: id)`
`330`		`- ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_x", value: -1.0)`
`331`		`- ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_y", value: -1.0)`
`332`		`- ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonLandscape", key: "\(id)_scale", value: -1.0)`
`333`	`334`	`}`
`334`	`335`	`} else {`
`335`	`336`	`for id in ["up", "down", "left", "right"] {`
`336`	`337`	`perButtonPortrait.removeValue(forKey: id)`
`337`		`- ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_x", value: -1.0)`
`338`		`- ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_y", value: -1.0)`
`339`		`- ARMSX2Bridge.setINIFloat("ARMSX2iOS/PadLayout/PerButtonPortrait", key: "\(id)_scale", value: -1.0)`
`340`	`338`	`}`
`341`	`339`	`}`
`342`		`- save()`
`343`	`340`	`}`
`344`	`341`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ struct GameScreenView: View {`
`96`	`96`	`}`
`97`	`97`	`menuButtonOverlay(isLandscape: false)`
`98`	`98`	`}`
	`99`	`+ .ignoresSafeArea()`
`99`	`100`	`}`
`100`	`101`	`}`
`101`	`102`	`.preference(key: GameScreenSizePreferenceKey.self, value: geo.size)`
Original file line number	Diff line number	Diff line change
`@@ -535,8 +535,7 @@ private struct DraggableButton: View {`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`var body: some View {`
`538`		`- let groupID = layout.groupID(for: id)`
`539`		`- let isVisible = layout.isControlVisible(groupID)`
	`538`	`+ let isVisible = layout.isControlVisible(id)`
`540`	`539`	`ZStack {`
`541`	`540`	`RoundedRectangle(cornerRadius: 6)`
`542`	`541`	`.fill(.white.opacity(0.05))`