armsx/ARMSX2
0
0
Fork 0
mirror of https://github.com/ARMSX2/ARMSX2.git synced 2026-08-24 16:50:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "iOS: put the appearance and emulator numbers on the number row"

Browse Source 
This reverts commit b2bb95c709.
This commit is contained in:
Jeen
2026-08-03 10:12:07 +02:00
parent 036831af65
commit 7a402860fb
2 changed files with 68 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/ios/app/src/main/swift/Views/Settings/AppearanceSettingsView.swift
+14 -3
View File
@@ -89,9 +89,20 @@ struct AppearanceSettingsView: View {
Label(settings.localized("Mute Video"), systemImage: settings.backgroundVideoMuted ? "speaker.slash" : "speaker.wave.2")
}
NumberRow("Background Dim", value: $settings.backgroundDim, in: 0...1,
format: .unitPercent, step: 0.05,
icon: "circle.lefthalf.filled", settings: settings)
VStack(alignment: .leading, spacing: 6) {
HStack {
Label(settings.localized("Background Dim"), systemImage: "circle.lefthalf.filled")
Spacer()
Text(String(format: "%d%%", Int(settings.backgroundDim * 100)))
.font(.subheadline.monospacedDigit())
.foregroundStyle(.secondary)
}
Slider(value: $settings.backgroundDim, in: 0.0...1.0, step: 0.05) {
Text(settings.localized("Background Dim"))
}
.accessibilityValue(String(format: "%d%%", Int(settings.backgroundDim * 100)))
}
.padding(.vertical, 4)
}
Section {
platforms/ios/app/src/main/swift/Views/Settings/EmulatorSettingsView.swift
+54 -8
View File
@@ -147,10 +147,34 @@ struct EmulatorSettingsView: View {
Toggle(settings.localized("Frame Limiter"), isOn: $settings.frameLimiterEnabled)
if settings.frameLimiterEnabled {
NumberRow("FPS Target", value: $settings.targetFPS,
in: SettingsStore.minTargetFPS...SettingsStore.maxTargetFPS,
format: .framesPerSecond, step: 1,
default: SettingsStore.defaultTargetFPS, settings: settings)
VStack(alignment: .leading, spacing: 8) {
HStack {
Text(settings.localized("FPS Target"))
Spacer()
Text(Self.formatFPS(settings.targetFPS))
.foregroundStyle(.secondary)
.font(.callout.monospacedDigit())
}
Slider(
value: $settings.targetFPS,
in: SettingsStore.minTargetFPS...SettingsStore.maxTargetFPS,
step: 1.0
)
HStack {
Text(Self.formatFPS(SettingsStore.minTargetFPS))
Spacer()
Button(settings.localized("60 FPS")) {
settings.targetFPS = SettingsStore.defaultTargetFPS
}
.buttonStyle(.borderless)
Spacer()
Text(Self.formatFPS(SettingsStore.maxTargetFPS))
}
.font(.caption.monospacedDigit())
.foregroundStyle(.secondary)
}
} else {
HStack {
Text(settings.localized("Speed Target"))
@@ -189,10 +213,26 @@ struct EmulatorSettingsView: View {
.foregroundStyle(.secondary)
Group {
NumberRow("Emulation-Only Mode Timer",
value: $settings.emulationOnlyModeDelaySeconds,
in: SettingsStore.emulationOnlyModeDelayRange,
format: .seconds.decimals(0), settings: settings)
VStack(alignment: .leading, spacing: 8) {
HStack {
Text(settings.localized("Emulation-Only Mode Timer"))
Spacer()
Text("\(settings.emulationOnlyModeDelaySeconds)s")
.foregroundStyle(.secondary)
.font(.callout.monospacedDigit())
}
Slider(
value: emulationOnlyModeDelayBinding,
in: Double(SettingsStore.emulationOnlyModeDelayRange.lowerBound)...Double(SettingsStore.emulationOnlyModeDelayRange.upperBound),
step: 1
) {
Text(settings.localized("Emulation-Only Mode Timer"))
} minimumValueLabel: {
Text("0s")
} maximumValueLabel: {
Text("15s")
}
}
Toggle(
settings.localized("Disable Cheats, Widescreen and Dynamic Patches"),
@@ -335,6 +375,12 @@ struct EmulatorSettingsView: View {
String(format: "%.2f FPS", value)
}
private var emulationOnlyModeDelayBinding: Binding<Double> {
Binding(
get: { Double(settings.emulationOnlyModeDelaySeconds) },
set: { settings.emulationOnlyModeDelaySeconds = Int($0.rounded()) }
)
}
/// Compact labeled picker over a fixed ordered option list (round/clamp modes).
@ViewBuilder