Add some Sonoma stuff

Desbeers · Nov 24, 2023 · 068d64d · 068d64d
1 parent b4f5aa7
commit 068d64d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/Chord Provider.xcodeproj/project.pbxproj b/Chord Provider.xcodeproj/project.pbxproj
@@ -811,7 +811,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 13.3;
+				MACOSX_DEPLOYMENT_TARGET = 13.5;
 				MARKETING_VERSION = 4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = nl.desbeers.chordprovider4;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -859,7 +859,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 13.3;
+				MACOSX_DEPLOYMENT_TARGET = 13.5;
 				MARKETING_VERSION = 4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = nl.desbeers.chordprovider4;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/Chord Provider/Views/EditorView/EditorView.swift b/Chord Provider/Views/EditorView/EditorView.swift
@@ -13,6 +13,8 @@ import SwiftUI
 struct EditorView: View {
     /// The ChordPro document
     @Binding var document: ChordProDocument
+    /// The app state
+    @EnvironmentObject var appState: AppState
     /// The scene state
     @EnvironmentObject var sceneState: SceneState
     /// Show a directive sheet

diff --git a/Chord Provider/macOS/FileBrowserView (macOS).swift b/Chord Provider/macOS/FileBrowserView (macOS).swift
@@ -36,6 +36,7 @@ struct FileBrowserView: View {
                 }
                 .pickerStyle(.segmented)
                 .labelsHidden()
+                .disabled(!search.isEmpty)
                 .task(id: tabItem) {
                     selectedTag = []
                 }
@@ -56,6 +57,7 @@ struct FileBrowserView: View {
                             }
                         }
                     }
+                    .searchable(text: $search, placement: .sidebar)
                     .opacity(selectedTag.isEmpty ? 1 : 0)
                     .navigationDestination(for: String.self) { tag in
                         List {
@@ -92,9 +94,14 @@ struct FileBrowserView: View {
             allTags = Array(Set(tags).sorted())
         }
         .toolbar {
-            folderButton
+            if #available(macOS 14, *) {
+                folderButton
+                    .fileDialogMessage("Select a folder with your songs")
+                    .fileDialogConfirmationLabel("Select")
+            } else {
+                folderButton
+            }
         }
-        .searchable(text: $search, placement: .sidebar)
     }
     /// Folder selection button
     var folderButton: some View {
@@ -153,6 +160,8 @@ extension FileBrowserView {
         @EnvironmentObject private var fileBrowser: FileBrowser
         /// Open documents in the environment
         @Environment(\.openDocument) private var openDocument
+        /// Focus of the Window
+        @Environment(\.controlActiveState) var controlActiveState
         /// Information about the `NSWindow`
         var window: NSWindow.WindowItem? {
             fileBrowser.openWindows.first { $0.fileURL == song.fileURL }
@@ -174,7 +183,7 @@ extension FileBrowserView {
                                 }
                                 if !song.tags.isEmpty {
                                     Text(song.tags.joined(separator: " ∙ "))
-                                        .foregroundStyle(.tertiary)
+                                        .foregroundStyle(controlActiveState == .key ? .tertiary : .quaternary)
                                 }
                             }
                         },