-
Notifications
You must be signed in to change notification settings - Fork 395
Add color-coded menu bar icons and separator style option #356
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.
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
Open
johnlarkin1
wants to merge
1
commit into
steipete:main
Choose a base branch
from
johnlarkin1:upstream-pr/color-menu-bar-gradient
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import Foundation | ||
|
|
||
| /// Controls the separator character between percent and pace in the menu bar. | ||
| enum MenuBarSeparatorStyle: String, CaseIterable, Identifiable { | ||
| case dot | ||
| case pipe | ||
|
|
||
| var id: String { | ||
| self.rawValue | ||
| } | ||
|
|
||
| var separator: String { | ||
| switch self { | ||
| case .dot: " · " | ||
| case .pipe: " | " | ||
| } | ||
| } | ||
|
|
||
| var label: String { | ||
| switch self { | ||
| case .dot: "Dot (·)" | ||
| case .pipe: "Pipe (|)" | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import AppKit | ||
|
|
||
| enum UsageColorLevel: Sendable { | ||
| /// Returns a smoothly interpolated tint color based on usage percentage. | ||
| /// - 0-70%: green blending toward orange | ||
| /// - 70-90%: orange blending toward red | ||
| /// - >= 90%: red | ||
| /// - nil usage: returns nil (monochrome fallback) | ||
| static func tintColor(for usedPercent: Double?) -> NSColor? { | ||
| guard let pct = usedPercent else { return nil } | ||
| let clamped = min(max(pct, 0), 100) | ||
|
|
||
| if clamped < 70 { | ||
| let fraction = CGFloat(clamped / 70) | ||
| return NSColor.systemGreen.blended(withFraction: fraction, of: .systemOrange) | ||
| } else if clamped < 90 { | ||
| let fraction = CGFloat((clamped - 70) / 20) | ||
| return NSColor.systemOrange.blended(withFraction: fraction, of: .systemRed) | ||
| } else { | ||
| return .systemRed | ||
| } | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
StatusItemControlleronly refreshes the menu bar whensettings.menuObservationTokenchanges, but this token never readsmenuBarSeparatorStyleeven though rendering now depends on it (StatusItemController+Animation.swiftcallsself.settings.menuBarSeparatorStyleinmenuBarDisplayText). As a result, changing the Separator picker can leave the menu bar text unchanged until some unrelated setting/store update happens, making the new preference appear broken.Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree with CC... this appears to be a false positive of a comment...
The very next line references
self.menuBarSeparatorStyle.