Skip to content
Open
Changes from all commits
Commits
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
39 changes: 30 additions & 9 deletions Coder-Desktop/Coder-Desktop/Coder_DesktopApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Comment on lines +179 to +181
Copy link
Copy Markdown
Member

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

Suggested change
if #available(macOS 26, *) {
alert.informativeText = """
Coder Desktop is already running, but its menu bar item may be hidden or disabled.
if #available(macOS 26, *) {
alert.informativeText = """
Coder Desktop is already running, but its menu bar item may be disabled, or hidden due to a lack of space.
You can rearrange icons by holding command.

"""
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
Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The 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")!
)
}
}
}
}
Expand Down
Loading