From 697fdfafe49784e2c732a937f8fc9d6f07817de9 Mon Sep 17 00:00:00 2001
From: Max Goedjen <max.goedjen@gmail.com>
Date: Sat, 14 Jun 2025 16:42:12 -0700
Subject: [PATCH] Toolbar tweaks
---
Sources/Secretive.xcodeproj/project.pbxproj | 12 ++---
Sources/Secretive/Views/ContentView.swift | 21 +++++---
.../Secretive/Views/ToolbarButtonStyle.swift | 50 +++++++++++++------
3 files changed, 56 insertions(+), 27 deletions(-)
diff --git a/Sources/Secretive.xcodeproj/project.pbxproj b/Sources/Secretive.xcodeproj/project.pbxproj
index a96d508..ee2659a 100644
--- a/Sources/Secretive.xcodeproj/project.pbxproj
+++ b/Sources/Secretive.xcodeproj/project.pbxproj
@@ -705,7 +705,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MACOSX_DEPLOYMENT_TARGET = 12.0;
+ MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1;
PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.Host;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -733,7 +733,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MACOSX_DEPLOYMENT_TARGET = 12.0;
+ MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1;
PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.Host;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -866,7 +866,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MACOSX_DEPLOYMENT_TARGET = 12.0;
+ MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1;
PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.Host;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -910,7 +910,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MACOSX_DEPLOYMENT_TARGET = 12.0;
+ MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1;
PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.SecretAgent;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -934,7 +934,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MACOSX_DEPLOYMENT_TARGET = 12.0;
+ MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1;
PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.SecretAgent;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -959,7 +959,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MACOSX_DEPLOYMENT_TARGET = 12.0;
+ MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1;
PRODUCT_BUNDLE_IDENTIFIER = com.maxgoedjen.Secretive.SecretAgent;
PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/Sources/Secretive/Views/ContentView.swift b/Sources/Secretive/Views/ContentView.swift
index c48991c..b7f2f76 100644
--- a/Sources/Secretive/Views/ContentView.swift
+++ b/Sources/Secretive/Views/ContentView.swift
@@ -30,10 +30,12 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
}
.frame(minWidth: 640, minHeight: 320)
.toolbar {
- toolbarItem(updateNoticeView, id: "update")
- toolbarItem(runningOrRunSetupView, id: "setup")
- toolbarItem(appPathNoticeView, id: "appPath")
- toolbarItem(newItemView, id: "new")
+ if #available(macOS 26.0, *) {
+ toolbarItem(updateNoticeView, id: "update")
+ toolbarItem(runningOrRunSetupView, id: "setup")
+ toolbarItem(appPathNoticeView, id: "appPath")
+ toolbarItem(newItemView, id: "new")
+ }
}
.sheet(isPresented: $runningSetup) {
SetupView(visible: $runningSetup, setupComplete: $hasRunSetup)
@@ -44,9 +46,14 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
extension ContentView {
-
- func toolbarItem(_ view: some View, id: String) -> ToolbarItem<String, some View> {
- ToolbarItem(id: id) { view }
+ @ToolbarContentBuilder
+ func toolbarItem(_ view: some View, id: String) -> some ToolbarContent {
+ if #available(macOS 26.0, *) {
+ ToolbarItem(id: id) { view }
+ .sharedBackgroundVisibility(.hidden)
+ } else {
+ ToolbarItem(id: id) { view }
+ }
}
var needsSetup: Bool {
diff --git a/Sources/Secretive/Views/ToolbarButtonStyle.swift b/Sources/Secretive/Views/ToolbarButtonStyle.swift
index a80cde4..045a24b 100644
--- a/Sources/Secretive/Views/ToolbarButtonStyle.swift
+++ b/Sources/Secretive/Views/ToolbarButtonStyle.swift
@@ -16,22 +16,44 @@ struct ToolbarButtonStyle: ButtonStyle {
self.lightColor = lightColor
self.darkColor = darkColor
}
+
+ private var backingColor: Color {
+ if !hovering {
+ colorScheme == .light ? lightColor : darkColor
+ } else {
+ colorScheme == .light ? .black.opacity(0.1) : .white.opacity(0.05)
+ }
+ }
+ @Namespace var namespace
func makeBody(configuration: Configuration) -> some View {
- configuration.label
- .padding(EdgeInsets(top: 6, leading: 8, bottom: 6, trailing: 8))
- .background(colorScheme == .light ? lightColor : darkColor)
- .foregroundColor(.white)
- .clipShape(RoundedRectangle(cornerRadius: 5))
- .overlay(
- RoundedRectangle(cornerRadius: 5)
- .stroke(colorScheme == .light ? .black.opacity(0.15) : .white.opacity(0.15), lineWidth: 1)
- .background(hovering ? (colorScheme == .light ? .black.opacity(0.1) : .white.opacity(0.05)) : Color.clear)
- )
- .onHover { hovering in
- withAnimation {
- self.hovering = hovering
+ if #available(macOS 26.0, *) {
+ configuration
+ .label
+ .foregroundColor(.white)
+ .padding(EdgeInsets(top: 6, leading: 8, bottom: 6, trailing: 8))
+ .glassEffect(.regular.tint(backingColor), in: .capsule, isEnabled: true)
+ .onHover { hovering in
+ withAnimation {
+ self.hovering = hovering
+ }
}
- }
+ } else {
+ configuration
+ .label
+ .background(colorScheme == .light ? lightColor : darkColor)
+ .foregroundColor(.white)
+ .clipShape(RoundedRectangle(cornerRadius: 5))
+ .overlay(
+ RoundedRectangle(cornerRadius: 5)
+ .stroke(colorScheme == .light ? .black.opacity(0.15) : .white.opacity(0.15), lineWidth: 1)
+ .background(hovering ? (colorScheme == .light ? .black.opacity(0.1) : .white.opacity(0.05)) : Color.clear)
+ )
+ .onHover { hovering in
+ withAnimation {
+ self.hovering = hovering
+ }
+ }
+ }
}
}