a

FlipByBlink · Oct 22, 2023 · 379b46d · 379b46d
1 parent cb97d1f
commit 379b46d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/watchOS/メニュー.swift b/watchOS/メニュー.swift
@@ -12,7 +12,7 @@ struct メニュートップ: View {
                 ガイドメニュー()
             }
             .navigationTitle("メニュー")
-            .toolbar { 閉じるボタン(self.dismiss) }
+            .modifier(閉じるボタン(self.dismiss))
         }
     }
 }

diff --git a/watchOS/増減モード.swift b/watchOS/増減モード.swift
@@ -103,7 +103,7 @@ struct 手駒増減メニュー: View {
         }
         .listStyle(.plain)
         .navigationTitle(self.陣営 == .王側 ? "王側の手駒" : "玉側の手駒")
-        .toolbar { 閉じるボタン(self.dismiss) }
+        .modifier(閉じるボタン(self.dismiss))
     }
     init(_ ｼﾞﾝｴｲ: 王側か玉側か) { self.陣営 = ｼﾞﾝｴｲ }
 }
diff --git a/watchOS/閉じるボタン.swift b/watchOS/閉じるボタン.swift
@@ -1,15 +1,22 @@
 import SwiftUI
 
-struct 閉じるボタン: ToolbarContent {
+struct 閉じるボタン: ViewModifier {
     private var dismiss: DismissAction
-    var body: some ToolbarContent {
-        ToolbarItem(placement: .cancellationAction) {
-            Button(role: .cancel) {
-                self.dismiss()
-                フィードバック.軽め()
-            } label: {
-                Image(systemName: "xmark")
-            }
+    func body(content: Content) -> some View {
+        if #available(watchOS 10.0, *) {
+            content
+        } else {
+            content
+                .toolbar {
+                    ToolbarItem(placement: .cancellationAction) {
+                        Button(role: .cancel) {
+                            self.dismiss()
+                            フィードバック.軽め()
+                        } label: {
+                            Image(systemName: "xmark")
+                        }
+                    }
+                }
         }
     }
     init(_ dismiss: DismissAction) {