Skip to content
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

Fix Find Navigator resizing delay, use line height from user settings #2018

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

Fix Find Navigator resizing delay, use line height from user settings #2018

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
30 changes: 21 additions & 9 deletions ...NavigatorArea/FindNavigator/FindNavigatorResultList/FindNavigatorListViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,25 +210,37 @@ extension FindNavigatorListViewController: NSOutlineViewDelegate {

func outlineView(_ outlineView: NSOutlineView, heightOfRowByItem item: Any) -> CGFloat {
if let item = item as? SearchResultMatchModel {
let columnWidth = outlineView.tableColumns.first?.width ?? outlineView.frame.width
let indentationLevel = outlineView.level(forItem: item)
let indentationSpace = CGFloat(indentationLevel) * outlineView.indentationPerLevel
let availableWidth = columnWidth - indentationSpace - 24

// Create a temporary text field for measurement
let tempView = NSTextField(wrappingLabelWithString: item.attributedLabel().string)
tempView.allowsDefaultTighteningForTruncation = false
tempView.cell?.truncatesLastVisibleLine = true
tempView.cell?.wraps = true
tempView.maximumNumberOfLines = 3
tempView.attributedStringValue = item.attributedLabel()
tempView.layout()
let width = outlineView.frame.width - outlineView.indentationPerLevel*2 - 24
return tempView.sizeThatFits(
NSSize(width: width, height: CGFloat.greatestFiniteMagnitude)
).height + 8
} else {
return rowHeight
tempView.maximumNumberOfLines = Settings.shared.preferences.general.findNavigatorDetail.rawValue
tempView.preferredMaxLayoutWidth = availableWidth

let height = tempView.sizeThatFits(
NSSize(width: availableWidth, height: CGFloat.greatestFiniteMagnitude)
).height
return max(height + 8, rowHeight)
}
return rowHeight
}

func outlineViewColumnDidResize(_ notification: Notification) {
// Disable animations temporarily
NSAnimationContext.beginGrouping()
NSAnimationContext.current.duration = 0

let indexes = IndexSet(integersIn: 0..<searchItems.count)
outlineView.noteHeightOfRows(withIndexesChanged: indexes)

NSAnimationContext.endGrouping()
outlineView.layoutSubtreeIfNeeded()
}
}

Expand Down