Skip to content

Fix popover crash on macOS Sequoia #1

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

Open
xiaocang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix popover crash on macOS Sequoia #1

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
14 changes: 3 additions & 11 deletions Ports/Logic/StatusBarController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,12 @@ class StatusBarController: NSObject, NSPopoverDelegate {
statusBarButton.image = NSImage(named: "MenuBarIcon")
statusBarButton.image?.size = NSSize(width: 18.0, height: 18.0)
statusBarButton.image?.isTemplate = true
statusBarButton.setButtonType(.onOff)

NSEvent.addLocalMonitorForEvents(matching: .leftMouseDown) { [weak self] event in
if event.window == self?.statusItem.button?.window {
self?.togglePopover(sender: statusBarButton)
return nil
}

return event
}
statusBarButton.action = #selector(togglePopover)
statusBarButton.target = self
}
}

@objc func togglePopover(sender: AnyObject) {
@objc func togglePopover(_ sender: AnyObject) {
if popover.isShown {
hidePopover(sender)
} else {
Expand Down
28 changes: 14 additions & 14 deletions Ports/Views/MainView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ struct MainView<ViewModelType: MainViewModelType>: View {
.listStyle(.sidebar)
HStack {
Spacer()
MenuButton(
label: Image(systemName: "gearshape.fill"),
content: {
Button(localizedString("openWebsite")) {
NSWorkspace.shared.open(URL(string: "https://chaosspace.de/ports?utm_source=portsapp")!)
}
Button(localizedString("quit")) {
exit(0)
}
})
.frame(width: 20, height: 20)
.menuButtonStyle(BorderlessButtonMenuButtonStyle())
Menu {
Button(localizedString("openWebsite")) {
NSWorkspace.shared.open(URL(string: "https://chaosspace.de/ports?utm_source=portsapp")!)
}
Button(localizedString("quit")) {
exit(0)
}
} label: {
Image(systemName: "gearshape.fill")
}
.menuStyle(.borderlessButton)
.frame(width: 20, height: 20)
.padding(EdgeInsets(top: 0, leading: 10, bottom: 10, trailing: 10))
}
}
Expand All @@ -61,12 +61,12 @@ protocol MainViewModelType: ObservableObject {
}

class MainViewModel: ObservableObject, MainViewModelType {
@ObservedObject var processManager: ProcessManager
private let processManager: ProcessManager
@Published var processList: ProcessList

init(processManager: ProcessManager) {
self.processManager = processManager
self.processList = ProcessList(lastUpdated: Date(), processes: [])
self.processList = processManager.processList
processManager.$processList.assign(to: &$processList)
}

Expand Down