Make single non-local drops work with multiple accounts

This commit is contained in:
Maurice Parker
2019-05-01 17:33:08 -05:00
parent 73f035c5b7
commit 78e98e4c03
6 changed files with 28 additions and 16 deletions

View File

@@ -32,17 +32,21 @@ class FolderTreeMenu {
}
return menu
}
static func select(_ folder: Folder, in popupButton: NSPopUpButton) {
static func select(account: Account, folder: Folder?, in popupButton: NSPopUpButton) {
for menuItem in popupButton.itemArray {
if let oneFolder = menuItem.representedObject as? Folder, oneFolder == folder {
if let oneAccount = menuItem.representedObject as? Account, oneAccount == account && folder == nil {
popupButton.select(menuItem)
return
}
if let oneFolder = menuItem.representedObject as? Folder, oneFolder == folder {
if oneFolder.account == account {
popupButton.select(menuItem)
return
}
}
}
}