Skip to content

fix: add macOS 15 backward compatibility for glassEffect #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
angristan merged 1 commit into from
Dec 28, 2025
+37 −16
Merged

fix: add macOS 15 backward compatibility for glassEffect #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MacThrottle.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 26.0;
MACOSX_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -304,7 +304,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 26.0;
MACOSX_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = macosx;
Expand Down
28 changes: 20 additions & 8 deletions MacThrottle/Views/AboutView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,18 @@ import SwiftUI
struct AboutView: View {
var body: some View {
VStack(spacing: 16) {
Image(nsImage: NSImage(named: "AppIcon") ?? NSApp.applicationIconImage)
.resizable()
.frame(width: 128, height: 128)
.cornerRadius(24)
.glassEffect(.regular.interactive(), in: RoundedRectangle(cornerRadius: 24))
if #available(macOS 26.0, *) {
Image(nsImage: NSImage(named: "AppIcon") ?? NSApp.applicationIconImage)
.resizable()
.frame(width: 128, height: 128)
.cornerRadius(24)
.glassEffect(.regular.interactive(), in: RoundedRectangle(cornerRadius: 24))
} else {
Image(nsImage: NSImage(named: "AppIcon") ?? NSApp.applicationIconImage)
.resizable()
.frame(width: 128, height: 128)
.cornerRadius(24)
}

Text("MacThrottle")
.font(.title)
Expand All @@ -23,9 +30,14 @@ struct AboutView: View {
.foregroundStyle(.secondary)

if let url = URL(string: "https://github.com/angristan/MacThrottle") {
Link("View on GitHub", destination: url)
.font(.caption)
.glassEffect()
if #available(macOS 26.0, *) {
Link("View on GitHub", destination: url)
.font(.caption)
.glassEffect()
} else {
Link("View on GitHub", destination: url)
.font(.caption)
}
}
}
.padding(32)
Expand Down
21 changes: 15 additions & 6 deletions MacThrottle/Views/HistoryViews.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,21 @@ struct HistoryGraphView: View {
let timeAgo = Int(Date().timeIntervalSince(entry.timestamp))
let timeStr = timeAgo < 60 ? "\(timeAgo)s ago" : "\(timeAgo / 60)m ago"
let fanStr = showFanSpeed ? entry.fanSpeed.map { " • Fan \(Int($0))%" } ?? "" : ""
Text("\(Int(temp))° • \(entry.pressure.displayName)\(fanStr) • \(timeStr)")
.font(.system(size: 8, weight: .medium))
.padding(.horizontal, 6)
.padding(.vertical, 3)
.glassEffect(.regular, in: RoundedRectangle(cornerRadius: 6))
.padding(4)
if #available(macOS 26.0, *) {
Text("\(Int(temp))° • \(entry.pressure.displayName)\(fanStr) • \(timeStr)")
.font(.system(size: 8, weight: .medium))
.padding(.horizontal, 6)
.padding(.vertical, 3)
.glassEffect(.regular, in: RoundedRectangle(cornerRadius: 6))
.padding(4)
} else {
Text("\(Int(temp))° • \(entry.pressure.displayName)\(fanStr) • \(timeStr)")
.font(.system(size: 8, weight: .medium))
.padding(.horizontal, 6)
.padding(.vertical, 3)
.background(.ultraThinMaterial, in: RoundedRectangle(cornerRadius: 6))
.padding(4)
}
}
}
}
Expand Down