The open-source Arc replacement for macOS. Spaces, pinned tabs, split view, Little Windows and Arc's shortcuts on Chromium, with your Arc sidebar imported in one go.
Expose extension icon controls consistently in compact and full toolbars (#14)
Quinn Battersbyf232c4fea715
diff --git a/Sources/Cra/UI/PaneToolbarView.swift b/Sources/Cra/UI/PaneToolbarView.swiftindex b4ddb18..4a2cd46 100644--- a/Sources/Cra/UI/PaneToolbarView.swift+++ b/Sources/Cra/UI/PaneToolbarView.swift@@ -377,6 +377,7 @@ final class ToolbarGlyphButton: NSView {private let imageView = NSImageView()private var tip: ArcTooltipAnchorView?private var enabled = true+ private var contextClick = falseprivate var hovering = false { didSet { if hovering != oldValue { refreshFill() } } }private var shown: (String?, NSImage?, CGFloat, NSColor, Bool)?@@ -435,9 +436,12 @@ final class ToolbarGlyphButton: NSView {override func mouseEntered(with event: NSEvent) { hovering = true }override func mouseExited(with event: NSEvent) { hovering = false }- override func mouseDown(with event: NSEvent) {}+ override func mouseDown(with event: NSEvent) {+ contextClick = event.modifierFlags.contains(.control) && menuProvider != nil+ if contextClick, let menu = menuProvider?() { NSMenu.popUpContextMenu(menu, with: event, for: self) }+ }override func mouseUp(with event: NSEvent) {- if enabled, bounds.contains(convert(event.locationInWindow, from: nil)) { action() }+ if !contextClick, enabled, bounds.contains(convert(event.locationInWindow, from: nil)) { action() }}override func menu(for event: NSEvent) -> NSMenu? { menuProvider?() }}diff --git a/Sources/Cra/UI/Sidebar/List/SidebarView.swift b/Sources/Cra/UI/Sidebar/List/SidebarView.swiftindex 4f9484c..adf04f3 100644--- a/Sources/Cra/UI/Sidebar/List/SidebarView.swift+++ b/Sources/Cra/UI/Sidebar/List/SidebarView.swift@@ -273,7 +273,7 @@ final class SidebarTopBarView: NSView {let host = URL(string: url)?.host ?? ""let text = tab == nil ? "Search or Enter URL…" : (host.isEmpty ? SuggestionEngine.humanURL(url) : host.replacingOccurrences(of: "www.", with: ""))let ext = ExtensionStore.shared- let pinned = ext.pinnedIDs.compactMap { id in ext.entries.first { $0.extensionID == id }.map { (id, $0.name, $0.icon) } }+ let pinned = ext.pinnedIDs.compactMap { id in ext.entries.first { $0.extensionID == id }.map { (id, $0.name, ext.toolbarIcon(for: $0)) } }pill.show(text: text, url: url, hasTab: tab != nil, status: ui.toolbarStatus, colors: colors, active: active,pinned: pinned, hasExtensions: !ext.entries.isEmpty)}@@ -443,6 +443,7 @@ final class SidebarURLPill: NSView {let b = ToolbarGlyphButton()b.configure(symbol: nil, image: icon, help: name, enabled: true, width: 28, iconSize: 16, tint: colors.textSecondary)b.action = { actions.runExtension(id) }+ b.menuProvider = { ExtensionStore.shared.entries.first { $0.extensionID == id }.map(ExtensionsMenu.iconMenu) }accessories.append(b)}let copy = SidebarGlyphButton(symbol: "link", size: 28, height: 28, iconSize: 14, weight: .regular, help: "Copy URL (⇧⌘C)", colors: colors) { actions.performAction("copyURL") }