-
Notifications
You must be signed in to change notification settings - Fork 7
fix: update messaging in menubar icon missing #246
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
jakehwll
wants to merge
1
commit into
main
Choose a base branch
from
jakehwll/hidden-menubar-messaging
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -147,7 +147,10 @@ class AppDelegate: NSObject, NSApplicationDelegate { | |
| } | ||
|
|
||
| func applicationShouldHandleReopen(_: NSApplication, hasVisibleWindows _: Bool) -> Bool { | ||
| if !state.skipHiddenIconAlert, let menuBar, !menuBar.menuBarExtra.isVisible { | ||
| if !state.skipHiddenIconAlert, | ||
| let menuBar, | ||
| !menuBar.menuBarExtra.isVisible | ||
| { | ||
| displayIconHiddenAlert() | ||
| } | ||
| return true | ||
|
|
@@ -173,15 +176,33 @@ class AppDelegate: NSObject, NSApplicationDelegate { | |
| let alert = NSAlert() | ||
| alert.alertStyle = .informational | ||
| alert.messageText = "Coder Desktop is hidden!" | ||
| alert.informativeText = """ | ||
| Coder Desktop is running, but there's no space in the menu bar for it's icon. | ||
| You can rearrange icons by holding command. | ||
| """ | ||
| if #available(macOS 26, *) { | ||
| alert.informativeText = """ | ||
| Coder Desktop is already running, but its menu bar item may be hidden or disabled. | ||
| """ | ||
| alert.addButton(withTitle: "Open Menu Bar Settings") | ||
| } else { | ||
| alert.informativeText = """ | ||
| Coder Desktop is already running, but there's no space in the menu bar for its icon. | ||
| """ | ||
| } | ||
|
Comment on lines
+179
to
+188
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is pretty ugly and the wording has changed. Maybe should chat to Design team to ensure this is the correct direction to head. |
||
|
|
||
| let suppressCheckbox = NSButton(checkboxWithTitle: "Don't show again", target: nil, action: nil) | ||
| suppressCheckbox.state = state.skipHiddenIconAlert ? .on : .off | ||
| alert.accessoryView = suppressCheckbox | ||
|
|
||
| alert.addButton(withTitle: "OK") | ||
| alert.addButton(withTitle: "Don't show again") | ||
| let resp = alert.runModal() | ||
| if resp == .alertSecondButtonReturn { | ||
| state.skipHiddenIconAlert = true | ||
| let response = alert.runModal() | ||
| state.skipHiddenIconAlert = suppressCheckbox.state == .on | ||
| if #available(macOS 26, *), response == .alertFirstButtonReturn { | ||
| // We'll need to ensure this continues to work in future macOS versions | ||
| if !NSWorkspace.shared.open( | ||
| URL(string: "x-apple.systempreferences:com.apple.ControlCenter-Settings.extension?MenuBar")! | ||
| ) { | ||
| NSWorkspace.shared.open( | ||
| URL(string: "x-apple.systempreferences:com.apple.ControlCenter-Settings.extension")! | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
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.
I personally think the 'you can hold command' thing is worth continuing to mention because idk how you discover it