Skip to content

Commit 80a4bd1

Browse files
committed
Revert "fix: break infinite restore loop when items are already in correct position"
This reverts commit 4a3dd24.
1 parent 2b41855 commit 80a4bd1

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

Thaw/MenuBar/MenuBarItems/MenuBarItemManager.swift

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,8 +1002,6 @@ extension MenuBarItemManager {
10021002
case itemResponseTimeout(MenuBarItem)
10031003
/// A menu bar item's bounds cannot be found.
10041004
case missingItemBounds(MenuBarItem)
1005-
/// The item is already in the correct position.
1006-
case itemAlreadyInCorrectPosition(MenuBarItem)
10071005

10081006
var description: String {
10091007
switch self {
@@ -1023,8 +1021,6 @@ extension MenuBarItemManager {
10231021
"\(Self.self).itemResponseTimeout(item: \(item.tag))"
10241022
case let .missingItemBounds(item):
10251023
"\(Self.self).missingItemBounds(item: \(item.tag))"
1026-
case let .itemAlreadyInCorrectPosition(item):
1027-
"\(Self.self).itemAlreadyInCorrectPosition(item: \(item.tag))"
10281024
}
10291025
}
10301026

@@ -1046,14 +1042,11 @@ extension MenuBarItemManager {
10461042
"\"\(item.displayName)\" took too long to respond"
10471043
case let .missingItemBounds(item):
10481044
"Missing bounds rectangle for \"\(item.displayName)\""
1049-
case let .itemAlreadyInCorrectPosition(item):
1050-
"Item already in correct position: \"\(item.displayName)\""
10511045
}
10521046
}
10531047

10541048
var recoverySuggestion: String? {
10551049
if case .itemNotMovable = self { return nil }
1056-
if case .itemAlreadyInCorrectPosition = self { return nil }
10571050
return "Please try again. If the error persists, please file a bug report."
10581051
}
10591052
}
@@ -1764,7 +1757,7 @@ extension MenuBarItemManager {
17641757

17651758
guard try await !itemHasCorrectPosition(item: item, for: destination, on: resolvedDisplayID) else {
17661759
MenuBarItemManager.diagLog.debug("Item has correct position, cancelling move")
1767-
throw EventError.itemAlreadyInCorrectPosition(item)
1760+
return
17681761
}
17691762

17701763
MouseHelpers.hideCursor(watchdogTimeout: watchdogTimeout)

0 commit comments

Comments
 (0)