Skip to content

Remove unused TreemapHitTester and dedupe hit testing #16

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phalladar merged 1 commit into from
Oct 3, 2026
Merged

Remove unused TreemapHitTester and dedupe hit testing #16

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: 0 additions & 14 deletions Sources/MacDirStat/Treemap/TreemapLayout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,17 +206,3 @@ struct TreemapLayoutEngine: Sendable {
return worst
}
}

struct TreemapHitTester: Sendable {
let items: [TreemapItem]

func itemAt(point: CGPoint) -> TreemapItem? {
// Reverse iterate to find deepest (topmost rendered) item
for item in items.reversed() {
if item.rect.contains(point: point) {
return item
}
}
return nil
}
}
15 changes: 3 additions & 12 deletions Sources/MacDirStat/Treemap/TreemapView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,21 +174,12 @@ struct TreemapView: View {
}

private func hitTestID(at point: CGPoint) -> Int? {
for item in items.reversed() {
if item.rect.contains(point: point) {
return item.id
}
}
return nil
hitTestItem(at: point)?.id
}

/// Items are drawn in order, so the last one containing the point is the deepest one on top.
private func hitTestItem(at point: CGPoint) -> TreemapItem? {
for item in items.reversed() {
if item.rect.contains(point: point) {
return item
}
}
return nil
items.last { $0.rect.contains(point: point) }
}

/// Folders drill into themselves. Files, which cover most of the treemap, drill into the
Expand Down
Loading