diff options
Diffstat (limited to 'Sora')
| -rw-r--r-- | Sora/App/SoraApp.swift | 15 | ||||
| -rw-r--r-- | Sora/Views/Post/Grid/PostGridThumbnailView.swift | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/Sora/App/SoraApp.swift b/Sora/App/SoraApp.swift index cea526f..8fdfb4d 100644 --- a/Sora/App/SoraApp.swift +++ b/Sora/App/SoraApp.swift @@ -14,6 +14,12 @@ func debugPrint( struct SoraApp: App { @StateObject private var settings = SettingsManager() + @ViewBuilder + private func settingsContent() -> some View { + SettingsView() + .environmentObject(settings) + } + var body: some Scene { WindowGroup { MainView() @@ -22,9 +28,12 @@ struct SoraApp: App { #if os(macOS) SwiftUI.Settings { - SettingsView() - .environmentObject(settings) - .windowResizeBehavior(.enabled) + if #available(macOS 15.0, *) { + settingsContent() + .windowResizeBehavior(.enabled) + } else { + settingsContent() + } } #endif } diff --git a/Sora/Views/Post/Grid/PostGridThumbnailView.swift b/Sora/Views/Post/Grid/PostGridThumbnailView.swift index ae9dbcb..8d82c94 100644 --- a/Sora/Views/Post/Grid/PostGridThumbnailView.swift +++ b/Sora/Views/Post/Grid/PostGridThumbnailView.swift @@ -40,7 +40,7 @@ struct PostGridThumbnailView: View { url: thumbnailURL, transaction: Transaction(animation: .default) ) { image in - if #available(iOS 18.0, *) { + if #available(iOS 18.0, *), #available(macOS 15.0, *) { imageContent(image: image) .onScrollVisibilityChange { visible in if post == posts.last, !manager.endOfData, visible { |