From 8e47f93b16c33aa952a83fccdba5cab1364df8c0 Mon Sep 17 00:00:00 2001 From: Kenta Kubo <601636+kkebo@users.noreply.github.com> Date: Sun, 7 Sep 2025 22:31:27 +0900 Subject: [PATCH] fix: fix `EditButton` color on Mac Catalyst --- DNSecure/Views/ContentView.swift | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/DNSecure/Views/ContentView.swift b/DNSecure/Views/ContentView.swift index b88c9af..81f9f93 100644 --- a/DNSecure/Views/ContentView.swift +++ b/DNSecure/Views/ContentView.swift @@ -325,7 +325,27 @@ extension ContentView: View { @ToolbarContentBuilder private var toolbarContent: some ToolbarContent { ToolbarItem(placement: .topBarLeading) { if #available(iOS 26, *) { - EditButton() + #if targetEnvironment(macCatalyst) + // Workaround for the issue that the checkmark icon is hard to see if System Settings > Appearance > Theme > Color is Multicolor. + Button { + withAnimation { + if !self.sidebarEditMode.isEditing { + self.sidebarEditMode = .active + } else { + self.sidebarEditMode = .inactive + } + } + } label: { + if !self.sidebarEditMode.isEditing { + Text("Edit") + } else { + Label("Done", systemImage: "checkmark") + } + } + .tint(self.sidebarEditMode.isEditing ? .accentColor : .primary) + #else + EditButton() + #endif } else { self.addMenu }