KofTwentyTwo/CommandTabFree
2
0 Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 4 Wiki Activity

fix: could sometimes crash when navigating up or down (closes #4110)

Browse Source
This commit is contained in:
lwouis committed 2025-11-10 20:48:58 +01:00
1 parent 26d40e1149
commit d2220c68bd
1 file changed
+13 -13
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/main-window/ThumbnailsView.swift
+13 -13
View File
@@ -69,21 +69,21 @@ class ThumbnailsView {
}
func navigateUpOrDown(_ direction: Direction, allowWrap: Bool = true) {
guard Windows.focusedWindowIndex < ThumbnailsView.recycledViews.count else { return }
let focusedViewFrame = ThumbnailsView.recycledViews[Windows.focusedWindowIndex].frame
let originCenter = NSMidX(focusedViewFrame)
if let targetRow = nextRow(direction, allowWrap: allowWrap) {
let leftSide = originCenter < NSMidX(contentView.frame)
let leadingSide = App.shared.userInterfaceLayoutDirection == .leftToRight ? leftSide : !leftSide
let iterable = leadingSide ? targetRow : targetRow.reversed()
let targetView = iterable.first {
if App.shared.userInterfaceLayoutDirection == .leftToRight {
return leadingSide ? NSMaxX($0.frame) > originCenter : NSMinX($0.frame) < originCenter
}
return leadingSide ? NSMinX($0.frame) < originCenter : NSMaxX($0.frame) > originCenter
} ?? iterable.last!
let targetIndex = ThumbnailsView.recycledViews.firstIndex(of: targetView)!
Windows.updateFocusedAndHoveredWindowIndex(targetIndex)
}
guard let targetRow = nextRow(direction, allowWrap: allowWrap), !targetRow.isEmpty else { return }
let leftSide = originCenter < NSMidX(contentView.frame)
let leadingSide = App.shared.userInterfaceLayoutDirection == .leftToRight ? leftSide : !leftSide
let iterable = leadingSide ? targetRow : targetRow.reversed()
guard let targetView = iterable.first(where: {
if App.shared.userInterfaceLayoutDirection == .leftToRight {
return leadingSide ? NSMaxX($0.frame) > originCenter : NSMinX($0.frame) < originCenter
}
return leadingSide ? NSMinX($0.frame) < originCenter : NSMaxX($0.frame) > originCenter
}) ?? iterable.last else { return }
guard let targetIndex = ThumbnailsView.recycledViews.firstIndex(of: targetView) else { return }
Windows.updateFocusedAndHoveredWindowIndex(targetIndex)
}
func updateItemsAndLayout() {