From 4ef7afe3ca8ba17473f5704dec6254e008684879 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Thu, 13 Jun 2019 18:25:13 +0530 Subject: macOS: Tunnel detail: Handle deletion outside app, again This was previously done in commit f281b93, but the changes in commit 1507a97 for handling deletion of multiple tunnels undid this capability. Signed-off-by: Roopesh Chander --- .../UI/macOS/ViewController/TunnelsListTableViewController.swift | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'WireGuard/WireGuard/UI/macOS/ViewController/TunnelsListTableViewController.swift') diff --git a/WireGuard/WireGuard/UI/macOS/ViewController/TunnelsListTableViewController.swift b/WireGuard/WireGuard/UI/macOS/ViewController/TunnelsListTableViewController.swift index f6d7790..0771582 100644 --- a/WireGuard/WireGuard/UI/macOS/ViewController/TunnelsListTableViewController.swift +++ b/WireGuard/WireGuard/UI/macOS/ViewController/TunnelsListTableViewController.swift @@ -12,7 +12,7 @@ class TunnelsListTableViewController: NSViewController { let tunnelsManager: TunnelsManager weak var delegate: TunnelsListTableViewControllerDelegate? - var isRemovingTunnels = false + var isRemovingTunnelsFromWithinTheApp = false let tableView: NSTableView = { let tableView = NSTableView() @@ -183,8 +183,10 @@ class TunnelsListTableViewController: NSViewController { guard let self = self else { return } self.selectTunnel(at: nextSelection) let selectedTunnels = selectedTunnelIndices.map { self.tunnelsManager.tunnel(at: $0) } + self.isRemovingTunnelsFromWithinTheApp = true self.tunnelsManager.removeMultiple(tunnels: selectedTunnels) { [weak self] error in guard let self = self else { return } + self.isRemovingTunnelsFromWithinTheApp = false defer { completion() } if let error = error { ErrorPresenter.showErrorAlert(error: error, from: self) @@ -281,9 +283,14 @@ extension TunnelsListTableViewController { } func tunnelRemoved(at index: Int) { + let selectedIndices = tableView.selectedRowIndexes + let isSingleSelectedTunnelBeingRemoved = selectedIndices.contains(index) && selectedIndices.count == 1 tableView.removeRows(at: IndexSet(integer: index), withAnimation: .slideLeft) if tunnelsManager.numberOfTunnels() == 0 { delegate?.tunnelsListEmpty() + } else if !isRemovingTunnelsFromWithinTheApp && isSingleSelectedTunnelBeingRemoved { + let newSelection = min(index, tunnelsManager.numberOfTunnels() - 1) + tableView.selectRowIndexes(IndexSet(integer: newSelection), byExtendingSelection: false) } } } -- cgit v1.2.3-59-g8ed1b