From 7945f94bf8a062443c178fe66e46cbd3b9bf833b Mon Sep 17 00:00:00 2001 From: Ethan Wong Date: Sat, 25 Jun 2022 14:39:12 +0800 Subject: [PATCH] Fix crash on macOS Ventura by moving pane .frame(width:) to its parents. --- Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift | 2 +- Xcodes/Frontend/Preferences/ExperiementsPreferencePane.swift | 2 +- Xcodes/Frontend/Preferences/GeneralPreferencePane.swift | 2 +- Xcodes/Frontend/Preferences/PreferencesView.swift | 1 + Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift b/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift index 0f94bd5..890e1ca 100644 --- a/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/AdvancedPreferencePane.swift @@ -118,7 +118,6 @@ struct AdvancedPreferencePane: View { } .groupBoxStyle(PreferencesGroupBoxStyle()) } - .frame(width: 500) } private var dataSourceFootnote: NSAttributedString { @@ -153,6 +152,7 @@ struct AdvancedPreferencePane_Previews: PreviewProvider { Group { AdvancedPreferencePane() .environmentObject(AppState()) + .frame(maxWidth: 500) } } } diff --git a/Xcodes/Frontend/Preferences/ExperiementsPreferencePane.swift b/Xcodes/Frontend/Preferences/ExperiementsPreferencePane.swift index 6f6c798..3696552 100644 --- a/Xcodes/Frontend/Preferences/ExperiementsPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/ExperiementsPreferencePane.swift @@ -21,7 +21,6 @@ struct ExperimentsPreferencePane: View { Divider() } - .frame(width: 500) } private var unxipFootnote: NSAttributedString { @@ -44,6 +43,7 @@ struct ExperimentsPreferencePane_Previews: PreviewProvider { Group { ExperimentsPreferencePane() .environmentObject(AppState()) + .frame(maxWidth: 500) } } } diff --git a/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift b/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift index d55a223..4735c24 100644 --- a/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift @@ -21,7 +21,6 @@ struct GeneralPreferencePane: View { } .groupBoxStyle(PreferencesGroupBoxStyle()) } - .frame(width: 500) } } @@ -30,6 +29,7 @@ struct GeneralPreferencePane_Previews: PreviewProvider { Group { GeneralPreferencePane() .environmentObject(AppState()) + .frame(maxWidth: 500) } } } diff --git a/Xcodes/Frontend/Preferences/PreferencesView.swift b/Xcodes/Frontend/Preferences/PreferencesView.swift index 5f6dc42..7442236 100644 --- a/Xcodes/Frontend/Preferences/PreferencesView.swift +++ b/Xcodes/Frontend/Preferences/PreferencesView.swift @@ -34,5 +34,6 @@ struct PreferencesView: View { .tag(Tabs.experiment) } .padding(20) + .frame(width: 500) } } diff --git a/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift b/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift index 5e3db80..282b806 100644 --- a/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/UpdatesPreferencePane.swift @@ -51,7 +51,6 @@ struct UpdatesPreferencePane: View { } .groupBoxStyle(PreferencesGroupBoxStyle()) } - .frame(width: 500) } private var lastUpdatedString: String { @@ -127,6 +126,7 @@ struct UpdatesPreferencePane_Previews: PreviewProvider { Group { UpdatesPreferencePane() .environmentObject(AppState()) + .frame(maxWidth: 500) } } }