Skip to content

SwiftUI: Add unlock framerate button #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SamoZ256 merged 9 commits into from
Feb 3, 2026
Merged

SwiftUI: Add unlock framerate button #97

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8873ff7
Add unlock framerate button
shinra-electric Jan 31, 2026
de32c4a
ToolbarSpacer is for macOS 26 or later
shinra-electric Jan 31, 2026
d246c6e
Fix compiling on Sequoia
shinra-electric Feb 2, 2026
41ecec1
Use picker for selecting handheld mode
shinra-electric Feb 2, 2026
133f3b3
Only have one console mode button on Sequoia
shinra-electric Feb 2, 2026
eb28a66
Remove disabled modifiers from Sequoia
shinra-electric Feb 2, 2026
fe7fec2
Switch function of lock/unlock
shinra-electric Feb 3, 2026
4373faf
Revert tooltips
shinra-electric Feb 3, 2026
9c9a1a6
Fiddle with the lock/unlock state again
shinra-electric Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 63 additions & 10 deletions src/frontend/swiftui/EmulationToolbarItems.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ struct EmulationToolbarItems: ToolbarContent {
@EnvironmentObject var globalState: GlobalState

@State private var isRunning: Bool = false
@State private var isFramerateUnlocked = false

var body: some ToolbarContent {
#if os(macOS)
Expand All @@ -30,22 +31,74 @@ struct EmulationToolbarItems: ToolbarContent {
}

ToolbarItemGroup(placement: .confirmationAction) {
Button("Console Mode", systemImage: "inset.filled.tv") {
globalState.isHandheldMode.toggle()
if isFramerateUnlocked {
Button{
isFramerateUnlocked.toggle()
} label: {
ZStack {
Image(systemName: "square.stack.3d.down.forward")
Image(systemName: "lock")
.symbolVariant(.none)
.font(.footnote)
.offset(x: 10, y: 5)
}
}
.help("Lock Framerate to 60fps")
} else {
Button{
isFramerateUnlocked.toggle()
} label: {
ZStack {
Image(systemName: "square.stack.3d.down.forward")
Image(systemName: "lock.open")
.symbolVariant(.none)
.font(.footnote)
.offset(x: 10, y: 5)
}
}
.help("Unlock Framerate")
}
}

// This compiler check is only needed when compiling on a macOS version earlier than 26
#if compiler(>=6.2.3)
if #available(macOS 26.0, *) {
ToolbarSpacer(.fixed)
}
.disabled(!globalState.isHandheldMode)
.help("Change to Console mode")

Button("Handheld Mode", systemImage: "formfitting.gamecontroller.fill") {
globalState.isHandheldMode.toggle()
#endif

if #available(macOS 26.0, *) {
ToolbarItemGroup(placement: .confirmationAction) {
Button("Console Mode", systemImage: "inset.filled.tv") {
globalState.isHandheldMode.toggle()
}
.disabled(!globalState.isHandheldMode)
.help("Change to Console mode")

Button("Handheld Mode", systemImage: "formfitting.gamecontroller.fill") {
globalState.isHandheldMode.toggle()
}
.disabled(globalState.isHandheldMode)
.help("Change to Handheld mode")
}
} else {
ToolbarItemGroup(placement: .confirmationAction) {
if globalState.isHandheldMode {
Button("Console Mode", systemImage: "inset.filled.tv") {
globalState.isHandheldMode.toggle()
}
.help("Change to Console mode")
} else {
Button("Handheld Mode", systemImage: "formfitting.gamecontroller.fill") {
globalState.isHandheldMode.toggle()
}
.help("Change to Handheld mode")
}
}
.disabled(globalState.isHandheldMode)
.help("Change to Handheld mode")
}
#else
// TODO: options
ToolbarItemGroup(placement: .principal) {}
#endif
}

}