Run Windows games on Apple Silicon — free, open source, with an open compatibility database that tells you what actually works.
Swift apple-silicond3dmetaldxmtdxvkfexgame-porting-toolkitgamingmac-gamingmacosmetalmoltenvksteamswiftuivkd3d-protonwhisky-alternativewindows-gameswinewine-wrapper
One library, no sidebar; environments and the engine move to Settings
Gauthier Piarrettea3d9a019a2f1
diff --git a/Sources/HighballApp/HighballApp.swift b/Sources/HighballApp/HighballApp.swiftindex b916b00..5cd52e6 100644--- a/Sources/HighballApp/HighballApp.swift+++ b/Sources/HighballApp/HighballApp.swift@@ -9,6 +9,7 @@ struct HighballApp: App {@State private var state = AppState()var body: some Scene {+ Settings { SettingsView().environment(state) }WindowGroup("Highball") {ContentView().environment(state)@@ -116,155 +117,31 @@ struct ContentView: View {if state.needsOnboarding {OnboardingView()} else {- NavigationSplitView {- List {- Section {- HStack(spacing: 9) {- if let url = Bundle.main.url(forResource: "AppIcon", withExtension: "png"), let img = NSImage(contentsOf: url) {- Image(nsImage: img).resizable().frame(width: 34, height: 34)- }- VStack(alignment: .leading, spacing: 0) {- Text("Highball").font(.system(size: 16, weight: .heavy, design: .rounded))- Text("v\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "dev")")- .font(.caption2.monospaced()).foregroundStyle(.tertiary)- }- }- .padding(.vertical, 2)- }- // One Library (Phase 2): the primary surface, above the bottles.- Section {- let onLibrary = state.pane == .library- Button {- state.pane = .library- } label: {- HStack(spacing: 8) {- Image(systemName: onLibrary ? "square.grid.2x2.fill" : "square.grid.2x2")- .foregroundStyle(onLibrary ? HB.amber : Color.secondary)- .frame(width: 18)- Text(L("Library")).fontWeight(onLibrary ? .semibold : .regular)- Spacer()- Text("\(state.libraryItems.count)")- .font(.caption2.monospaced()).foregroundStyle(.tertiary)- }- .contentShape(Rectangle())- }- .buttonStyle(.plain)- .padding(.vertical, 5).padding(.horizontal, 7)- .background(RoundedRectangle(cornerRadius: 7)- .fill(onLibrary ? HB.amber.opacity(0.16) : .clear))- .overlay(RoundedRectangle(cornerRadius: 7)- .stroke(onLibrary ? HB.amber.opacity(0.35) : .clear))- .listRowInsets(EdgeInsets(top: 1, leading: 6, bottom: 1, trailing: 6))- }- Section(L("Bottles")) {- ForEach(state.bottles, id: \.name) { bottle in- let selected = state.selectedBottle == bottle.name && state.pane == .bottles- Button {- state.selectedBottle = bottle.name- state.pane = .bottles- } label: {- HStack(spacing: 8) {- Image(systemName: "wineglass\(selected ? ".fill" : "")")- .foregroundStyle(selected ? HB.amber : Color.secondary)- .frame(width: 18)- VStack(alignment: .leading, spacing: 1) {- Text(bottle.name)- .fontWeight(selected ? .semibold : .regular)- // A large prefix takes a while to purge, and the row- // used to sit there looking idle and clickable.- if state.deletingBottles.contains(bottle.name) {- Text(L("deleting…"))- .font(.caption).foregroundStyle(.secondary)- }- }- Spacer()- }- .contentShape(Rectangle())- }- .buttonStyle(.plain)- .padding(.vertical, 5).padding(.horizontal, 7)- .background(RoundedRectangle(cornerRadius: 7)- .fill(selected ? HB.amber.opacity(0.16) : .clear))- .overlay(RoundedRectangle(cornerRadius: 7)- .stroke(selected ? HB.amber.opacity(0.35) : .clear))- .listRowInsets(EdgeInsets(top: 1, leading: 6, bottom: 1, trailing: 6))- .contextMenu {- Button(L("Stop all processes")) { state.killBottle(bottle) }- Button(L("Duplicate bottle")) { state.duplicateBottle(bottle) }- Button(L("Repair bottle (re-run first boot)")) { state.repairBottle(bottle) }- Divider()- Button(L("Delete bottle…"), role: .destructive) { pendingDelete = bottle.name }- .disabled(state.deletingBottles.contains(bottle.name))- }- }- // A folder under bottles/ that isn't a loadable bottle still needs- // somewhere to be acted on. Before #38 it was simply invisible, which- // left its files stranded and its name unusable.- ForEach(state.damagedBottles) { damaged in- Button { pendingDelete = damaged.name } label: {- HStack(spacing: 8) {- Image(systemName: "exclamationmark.triangle.fill")- .foregroundStyle(.orange)- .frame(width: 18)- VStack(alignment: .leading, spacing: 1) {- Text(damaged.name)- Text(L("damaged — click to delete"))- .font(.caption).foregroundStyle(.secondary)- }- Spacer()- }- .contentShape(Rectangle())- }- .buttonStyle(.plain)- .help(damaged.reason)- .padding(.vertical, 5).padding(.horizontal, 7)- .listRowInsets(EdgeInsets(top: 1, leading: 6, bottom: 1, trailing: 6))- }- }- if let engine = state.defaultEngine {- Section(L("Engine")) {- Label {- VStack(alignment: .leading, spacing: 1) {- Text(engine.displayName).font(.caption)- Text(engine.id).font(.caption2).foregroundStyle(.tertiary).lineLimit(1)- }- } icon: { Image(systemName: "gearshape.2").foregroundStyle(.secondary) }- if let update = state.engineUpdate {- Button {- state.updateEngine()- } label: {- Label {- VStack(alignment: .leading, spacing: 1) {- Text(L("Update engine")).font(.caption)- Text(update.id).font(.caption2).foregroundStyle(.tertiary).lineLimit(1)- }- } icon: { Image(systemName: "arrow.down.circle").foregroundStyle(.tint) }+ // One library, full width (UX plan Phase 1): no sidebar, no bottles in the way.+ // Environments and the engine live in Settings (⌘,).+ NavigationStack { LibraryView() }+ .toolbar {+ ToolbarItem(placement: .primaryAction) {+ Menu {+ Button(L("Install Steam")) { state.installSteam() }+ Button(L("Connect Epic account…")) { state.showEpicSignIn = true }+ Divider()+ ForEach(BottleView.launcherMeta.filter { $0.id != "steam" }, id: \.id) { meta in+ Button(String(format: L("Install %@"), meta.short)) {+ if let b = state.defaultBottle { state.applyRecipe(meta.id, to: b) }}- .buttonStyle(.plain)- .disabled(state.busy)- .help(L("Installs the newer engine this version of Highball ships. Bottles on the same Wine build move to it; the others stay on their engine until you switch them in the bottle's settings. Only changed components are downloaded."))}+ Divider()+ Button(L("A Windows program I have…")) { state.chooseProgramToRun() }+ } label: {+ Label(L("Add games"), systemImage: "plus")}+ .disabled(state.busy || state.bottles.isEmpty)}- }- .navigationSplitViewColumnWidth(min: 200, ideal: 230)- .toolbar {- Button { showCreate = true } label: { Label(L("New Bottle"), systemImage: "plus") }- }- } detail: {- switch state.pane {- case .library:- NavigationStack { LibraryView() }- case .bottles:- if let name = state.selectedBottle,- let bottle = state.bottles.first(where: { $0.name == name }) {- BottleView(bottle: bottle)- } else {- ContentUnavailableView(L("No bottle selected"), systemImage: "wineglass",- description: Text(L("Create a bottle to install Steam and play.")))+ ToolbarItem(placement: .automatic) {+ SettingsLink { Label(L("Settings"), systemImage: "gearshape") }}}- }}}// Everything that takes time lives on one strip at the bottom, never modal (UX plan 0.5).diff --git a/Sources/HighballApp/SettingsView.swift b/Sources/HighballApp/SettingsView.swiftnew file mode 100644index 0000000..ab4cc4a--- /dev/null+++ b/Sources/HighballApp/SettingsView.swift@@ -0,0 +1,177 @@+import SwiftUI+import HighballKit++/// Advanced is the Settings window (⌘,): environments live here and nowhere else (UX plan §3.7,+/// canvas "Advanced: Settings"). Nothing here is needed to play a game.+struct SettingsView: View {+ @Environment(AppState.self) private var state++ var body: some View {+ TabView {+ EnvironmentsPane().tabItem { Label(L("Environments"), systemImage: "cylinder.split.1x2") }+ EnginePane().tabItem { Label(L("Engine"), systemImage: "gearshape.2") }+ TroubleshootingPane().tabItem { Label(L("Troubleshooting"), systemImage: "wrench.and.screwdriver") }+ }+ .frame(minWidth: 760, minHeight: 520)+ }+}++/// One environment by default, more only when two games need settings that conflict.+struct EnvironmentsPane: View {+ @Environment(AppState.self) private var state+ @State private var openName: String?+ @State private var pendingDelete: String?+ @State private var showCreate = false++ var body: some View {+ VStack(alignment: .leading, spacing: 14) {+ Text(L("Highball keeps your games in one Windows environment and looks after it. A second one is only for a game whose settings conflict with the others."))+ .font(.callout).foregroundStyle(.secondary).fixedSize(horizontal: false, vertical: true)+ List {+ ForEach(state.bottles, id: \.name) { bottle in+ HStack(spacing: 12) {+ Image(systemName: "cylinder.split.1x2").foregroundStyle(.secondary)+ VStack(alignment: .leading, spacing: 2) {+ HStack(spacing: 8) {+ Text(bottle.name).font(.headline)+ if bottle.name == AppState.defaultEnvironmentName {+ Text(L("DEFAULT")).font(.system(size: 9, weight: .bold)).padding(.horizontal, 6).padding(.vertical, 2)+ .background(Capsule().fill(HB.good.opacity(0.2))).foregroundStyle(HB.good)+ }+ if state.deletingBottles.contains(bottle.name) {+ Text(L("deleting…")).font(.caption).foregroundStyle(.secondary)+ }+ }+ Text("\(state.engine(for: bottle)?.displayName ?? bottle.settings.engineID) · \(GamePageCopy.plainName(bottle.settings.renderer)) · \((state.gamesByBottle[bottle.name] ?? []).count) " + L("titles"))+ .font(.caption.monospacedDigit()).foregroundStyle(.secondary)+ }+ Spacer()+ Button(L("Open")) { openName = bottle.name }.controlSize(.small)+ }+ .padding(.vertical, 4)+ .contextMenu {+ Button(L("Open")) { openName = bottle.name }+ Button(L("Stop all processes")) { state.killBottle(bottle) }+ Button(L("Duplicate")) { state.duplicateBottle(bottle) }+ Button(L("Repair (re-run the Windows first boot)")) { state.repairBottle(bottle) }+ Divider()+ Button(L("Delete…"), role: .destructive) { pendingDelete = bottle.name }+ .disabled(state.deletingBottles.contains(bottle.name))+ }+ }+ ForEach(state.damagedBottles) { damaged in+ HStack(spacing: 12) {+ Image(systemName: "exclamationmark.triangle.fill").foregroundStyle(.orange)+ VStack(alignment: .leading, spacing: 2) {+ Text(damaged.name).font(.headline)+ Text(damaged.reason).font(.caption).foregroundStyle(.secondary)+ }+ Spacer()+ Button(L("Delete…"), role: .destructive) { pendingDelete = damaged.name }.controlSize(.small)+ }+ }+ }+ .frame(minHeight: 220)+ HStack(spacing: 10) {+ Button(L("New environment…")) { showCreate = true }.disabled(state.busy)+ if let b = state.defaultBottle {+ Button(L("Repair")) { state.repairBottle(b) }.disabled(state.busy)+ }+ Spacer()+ Text(L("Repair re-runs the Windows first boot. Games and Steam stay where they are."))+ .font(.caption).foregroundStyle(.secondary)+ }+ }+ .padding(20)+ .sheet(isPresented: .init(get: { openName != nil }, set: { if !$0 { openName = nil } })) {+ if let bottle = state.bottles.first(where: { $0.name == openName }) {+ NavigationStack {+ BottleView(bottle: bottle)+ .toolbar { ToolbarItem(placement: .cancellationAction) { Button(L("Done")) { openName = nil } } }+ }+ .frame(minWidth: 820, minHeight: 620)+ }+ }+ .sheet(isPresented: $showCreate) { CreateBottleSheet() }+ .confirmationDialog("Delete environment \"\(pendingDelete ?? "")\"? This removes its Windows drive and everything installed in it, games included.",+ isPresented: .init(get: { pendingDelete != nil }, set: { if !$0 { pendingDelete = nil } }),+ titleVisibility: .visible) {+ Button(L("Delete"), role: .destructive) { if let n = pendingDelete { state.deleteBottle(n) }; pendingDelete = nil }+ Button(L("Cancel"), role: .cancel) { pendingDelete = nil }+ }+ }+}++struct EnginePane: View {+ @Environment(AppState.self) private var state++ var body: some View {+ VStack(alignment: .leading, spacing: 14) {+ Text(L("The engine is the Wine build and graphics layers Highball runs games with. Highball picks it; an update never moves an environment to a different Wine build on its own."))+ .font(.callout).foregroundStyle(.secondary).fixedSize(horizontal: false, vertical: true)+ if let engine = state.defaultEngine {+ GroupBox {+ VStack(alignment: .leading, spacing: 6) {+ Text(engine.displayName).font(.headline)+ Text(engine.id).font(.caption.monospaced()).foregroundStyle(.secondary)+ Text(String(format: L("Graphics layers: %@"), ["dxmt", "dxvk", "d3dmetal"].filter { engine.rendererDir($0) != nil }.map { GamePageCopy.plainName(Renderer(rawValue: $0) ?? .dxvk) }.joined(separator: ", ")))+ .font(.caption).foregroundStyle(.secondary)+ if engine.rendererDir("d3dmetal") == nil, engine.manifest.components["d3dmetal"] != nil {+ Button(L("Read Apple's licence and turn on DirectX 12 support…")) {+ state.loadGPTKLicense(); state.showGPTKLicense = true+ }.buttonStyle(.link).font(.caption)+ }+ }.frame(maxWidth: .infinity, alignment: .leading)+ }+ }+ if let update = state.engineUpdate {+ GroupBox {+ HStack {+ VStack(alignment: .leading, spacing: 2) {+ Text(L("A newer engine is available")).font(.headline)+ Text(update.id).font(.caption.monospaced()).foregroundStyle(.secondary)+ }+ Spacer()+ Button(L("Update engine")) { state.updateEngine() }.disabled(state.busy)+ }+ }+ }+ if state.engines.count > 1 {+ Text(String(format: L("Installed engines: %@. An environment's engine is chosen on its own page."), state.engines.map(\.id).joined(separator: ", ")))+ .font(.caption).foregroundStyle(.secondary)+ }+ Spacer()+ }+ .padding(20)+ }+}++struct TroubleshootingPane: View {+ @Environment(AppState.self) private var state++ var body: some View {+ VStack(alignment: .leading, spacing: 14) {+ Text(L("When a game misbehaves, the log of its last launch is what a report needs. Nothing here is sent anywhere without you."))+ .font(.callout).foregroundStyle(.secondary).fixedSize(horizontal: false, vertical: true)+ HStack(spacing: 10) {+ Button(L("Show the logs folder")) { NSWorkspace.shared.open(state.paths.logs) }+ Button(L("Report a problem…")) {+ let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "dev"+ Task.detached {+ let url = BugReport.url(version: version)+ await MainActor.run { NSWorkspace.shared.open(url) }+ }+ }+ Button(L("Show the activity log")) { state.showLog = true }+ }+ if let b = state.defaultBottle {+ Divider()+ Text(String(format: L("If Steam or a game is stuck, stop the environment's processes; the next Play starts fresh. Environment: %@."), b.name))+ .font(.caption).foregroundStyle(.secondary).fixedSize(horizontal: false, vertical: true)+ Button(L("Stop all processes")) { state.killBottle(b) }.disabled(state.busy)+ }+ Spacer()+ }+ .padding(20)+ }+}