Migrate deprecated .menuStyle(.borderlessButton)

1024jp · 1024jp · commit 9fc4c2dfd8ce · 2026-04-01T00:32:26.000+09:00
diff --git a/CotEditor/Sources/Document Window/Accessory Views/UnicodeInputView.swift b/CotEditor/Sources/Document Window/Accessory Views/UnicodeInputView.swift
@@ -85,7 +85,8 @@ struct UnicodeInputView: View {
                     } label: {
                         EmptyView()
                     }
-                    .menuStyle(.borderlessButton)
+                    .menuStyle(.button)
+                    .buttonStyle(.borderless)
                     .frame(width: 16)
                     .padding(.leading, 4)
                 }
diff --git a/CotEditor/Sources/Document Window/Inspector/OutlineInspectorView.swift b/CotEditor/Sources/Document Window/Inspector/OutlineInspectorView.swift
@@ -189,7 +189,8 @@ struct OutlineInspectorView: View, HostedPaneView {
                         Button(String(localized: "Reset to Default", table: "MainMenu"), systemImage: "textformat.size", action: self.resetFont)
                     }
                 }
-                .menuStyle(.borderlessButton)
+                .menuStyle(.button)
+                .buttonStyle(.borderless)
                 .menuIndicator(.hidden)
                 .labelStyle(.iconOnly)
             }
diff --git a/CotEditor/Sources/Settings Window/Syntax Editor/SyntaxOutlineEditView.swift b/CotEditor/Sources/Settings Window/Syntax Editor/SyntaxOutlineEditView.swift
@@ -181,7 +181,8 @@ private struct OutlineKindMenu: View {
                     .foregroundStyle(.tertiary)
             }
         }
-        .menuStyle(.borderlessButton)
+        .menuStyle(.button)
+        .buttonStyle(.borderless)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,8 @@ struct UnicodeInputView: View {`
`85`	`85`	`} label: {`
`86`	`86`	`EmptyView()`
`87`	`87`	`}`
`88`		`- .menuStyle(.borderlessButton)`
	`88`	`+ .menuStyle(.button)`
	`89`	`+ .buttonStyle(.borderless)`
`89`	`90`	`.frame(width: 16)`
`90`	`91`	`.padding(.leading, 4)`
`91`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,8 @@ struct OutlineInspectorView: View, HostedPaneView {`
`189`	`189`	`Button(String(localized: "Reset to Default", table: "MainMenu"), systemImage: "textformat.size", action: self.resetFont)`
`190`	`190`	`}`
`191`	`191`	`}`
`192`		`- .menuStyle(.borderlessButton)`
	`192`	`+ .menuStyle(.button)`
	`193`	`+ .buttonStyle(.borderless)`
`193`	`194`	`.menuIndicator(.hidden)`
`194`	`195`	`.labelStyle(.iconOnly)`
`195`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,8 @@ private struct OutlineKindMenu: View {`
`181`	`181`	`.foregroundStyle(.tertiary)`
`182`	`182`	`}`
`183`	`183`	`}`
`184`		`- .menuStyle(.borderlessButton)`
	`184`	`+ .menuStyle(.button)`
	`185`	`+ .buttonStyle(.borderless)`
`185`	`186`	`}`
`186`	`187`	`}`
`187`	`188`