|
|
@@ -2250,29 +2250,11 @@ class ViewController: NSViewController {
|
|
|
}
|
|
|
updateSearchHintVisibility()
|
|
|
|
|
|
- let backForwardCluster = NSStackView()
|
|
|
- backForwardCluster.orientation = .horizontal
|
|
|
- backForwardCluster.spacing = 4
|
|
|
- backForwardCluster.alignment = .centerY
|
|
|
- let backButton = makeNavGlyphButton(symbol: "chevron.left", action: #selector(topBarPlaceholderTapped), dimension: 14, pointSize: 7, toolTip: "Back")
|
|
|
- let forwardButton = makeNavGlyphButton(symbol: "chevron.right", action: #selector(topBarPlaceholderTapped), dimension: 14, pointSize: 7, toolTip: "Forward")
|
|
|
- [backButton, forwardButton].forEach { backForwardCluster.addArrangedSubview($0) }
|
|
|
-
|
|
|
- let leftTopBarCluster = NSStackView()
|
|
|
- leftTopBarCluster.orientation = .horizontal
|
|
|
- leftTopBarCluster.spacing = 0
|
|
|
- leftTopBarCluster.alignment = .centerY
|
|
|
- let historyButton = makeNavGlyphButton(symbol: "clock.arrow.circlepath", action: #selector(topBarPlaceholderTapped), toolTip: "History")
|
|
|
- let navHistoryGap = NSView()
|
|
|
- navHistoryGap.translatesAutoresizingMaskIntoConstraints = false
|
|
|
- navHistoryGap.widthAnchor.constraint(equalToConstant: 12).isActive = true
|
|
|
- [backForwardCluster, navHistoryGap, historyButton].forEach { leftTopBarCluster.addArrangedSubview($0) }
|
|
|
-
|
|
|
let searchRow = NSStackView()
|
|
|
searchRow.orientation = .horizontal
|
|
|
searchRow.spacing = 14
|
|
|
searchRow.alignment = .centerY
|
|
|
- [leftTopBarCluster, searchPill].forEach { searchRow.addArrangedSubview($0) }
|
|
|
+ searchRow.addArrangedSubview(searchPill)
|
|
|
|
|
|
let rightTopBarCluster = NSStackView()
|
|
|
rightTopBarCluster.orientation = .horizontal
|
|
|
@@ -2377,7 +2359,7 @@ class ViewController: NSViewController {
|
|
|
content.addSubview(topBarDivider)
|
|
|
content.addSubview(contentColumn)
|
|
|
|
|
|
- [brandStack, searchRow, backForwardCluster, leftTopBarCluster, rightTopBarCluster, searchPill, searchField, searchIcon, searchHintLabel].forEach {
|
|
|
+ [brandStack, searchRow, rightTopBarCluster, searchPill, searchField, searchIcon, searchHintLabel].forEach {
|
|
|
$0.translatesAutoresizingMaskIntoConstraints = false
|
|
|
}
|
|
|
[brandStack].forEach {
|