swiftbar/SwiftBar
1
1
Fork 0
mirror of https://github.com/swiftbar/SwiftBar.git synced 2024-09-11 07:55:23 +03:00
Code Issues Projects Releases Wiki Activity

Make web popover detachable #374 Make webpopoer persistent #359

Browse Source
This commit is contained in:
Alex Mazanov 2023-04-22 17:58:07 -04:00
parent 61b0dea1b6
commit dcee8db6e4
No known key found for this signature in database
GPG Key ID: FD35C3C7C1D34AB4
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
SwiftBar/MenuBar/MenuBarItem.swift
View File

@ -70,6 +70,10 @@ class MenubarItem: NSObject {
Timer.TimerPublisher(interval: titleCylleInterval, runLoop: .main, mode: .default)
}
var refreshOnOpen: Bool {
plugin?.metadata?.refreshOnOpen ?? false
}
lazy var menuUpdateQueue: OperationQueue = delegate.pluginManager.menuUpdateQueue
init(title: String, plugin: Plugin? = nil) {
@ -81,6 +85,7 @@ class MenubarItem: NSObject {
buildStandardMenu()
return
}
webPopover.delegate = self
self.plugin = plugin
barItem.autosaveName = plugin?.id
statusBarMenu.delegate = self
@ -364,13 +369,19 @@ extension MenubarItem {
}
func showWebPopover(url: URL, widht: CGFloat, height: CGFloat) {
defer {
webPopover.show(relativeTo: barItem.button!.bounds, of: barItem.button!, preferredEdge: .minY)
webPopover.contentViewController?.view.window?.becomeKey()
startPopupMonitor()
}
guard webPopover.contentViewController == nil || refreshOnOpen else {
return
}
let urlRequest = URLRequest(url: url)
webPopover.behavior = .transient
webPopover.contentViewController = NSHostingController(rootView: WebPanelView(request: urlRequest))
webPopover.contentViewController = NSHostingController(rootView: WebPanelView(request: urlRequest, name: plugin?.name ?? ""))
webPopover.contentSize = NSSize(width: widht, height: height)
webPopover.show(relativeTo: barItem.button!.bounds, of: barItem.button!, preferredEdge: .minY)
webPopover.contentViewController?.view.window?.becomeKey()
startPopupMonitor()
}
func hideWebPopover(_ sender: AnyObject?) {
@ -672,7 +683,7 @@ extension MenubarItem {
}
func showMenu() {
if plugin?.metadata?.refreshOnOpen == true, plugin?.type == .Executable {
if refreshOnOpen, plugin?.type == .Executable {
refreshAndShowMenu()
return
}
@ -780,3 +791,9 @@ extension MenubarItem: NSWindowDelegate, NSDraggingDestination {
return true
}
}
extension MenubarItem: NSPopoverDelegate {
func popoverShouldDetach(_: NSPopover) -> Bool {
true
}
}

12
SwiftBar/UI/WebView.swift
View File

@ -14,8 +14,20 @@ struct WebView: NSViewRepresentable {
struct WebPanelView: View {
let request: URLRequest
let name: String
var body: some View {
VStack {
ZStack {
if #available(macOS 12.0, *) {
Rectangle().fill(.bar)
} else if #available(macOS 12.0, *) {
Rectangle().fill(.background)
} else {
Rectangle().fill(.gray)
}
Text("SwiftBar: \(name)")
.font(.headline)
}.frame(height: 20)
WebView(request: request)
}
}