From 41b80d46a5eb29bf6dbdcb9fe5271b25680d358c Mon Sep 17 00:00:00 2001 From: Hasan Armoush Date: Sat, 22 Jun 2024 18:35:48 +0300 Subject: [PATCH 1/2] File Icon Type setting reflects immediately #1765 --- .../OutlineView/ProjectNavigatorViewController.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorViewController.swift b/CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorViewController.swift index ef12c300c6..5d55565681 100644 --- a/CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorViewController.swift +++ b/CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorViewController.swift @@ -28,7 +28,13 @@ final class ProjectNavigatorViewController: NSViewController { var workspace: WorkspaceDocument? - var iconColor: SettingsData.FileIconStyle = .color + var iconColor: SettingsData.FileIconStyle = .color { + willSet { + if newValue != iconColor { + outlineView.reloadData() + } + } + } var fileExtensionsVisibility: SettingsData.FileExtensionsVisibility = .showAll var shownFileExtensions: SettingsData.FileExtensions = .default From 25d8d768b69c2ba338e79021503c2f004218c007 Mon Sep 17 00:00:00 2001 From: Tom Ludwig Date: Sun, 23 Jun 2024 10:33:06 +0200 Subject: [PATCH 2/2] :rotating_light: swiftlint --- .../OutlineView/ProjectNavigatorViewController.swift | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorViewController.swift b/CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorViewController.swift index 5d55565681..df961ef065 100644 --- a/CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorViewController.swift +++ b/CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorViewController.swift @@ -281,9 +281,7 @@ extension ProjectNavigatorViewController: NSOutlineViewDelegate { } func outlineViewSelectionDidChange(_ notification: Notification) { - guard let outlineView = notification.object as? NSOutlineView else { - return - } + guard let outlineView = notification.object as? NSOutlineView else { return } let selectedIndex = outlineView.selectedRow @@ -304,13 +302,9 @@ extension ProjectNavigatorViewController: NSOutlineViewDelegate { guard let id = workspace?.editorManager.activeEditor.selectedTab?.file.id, let item = workspace?.workspaceFileManager?.getFile(id, createIfNotFound: true) - else { - return - } + else { return } /// update outline selection only if the parent of selected item match with expanded item - guard item.parent === notification.userInfo?["NSObject"] as? CEWorkspaceFile else { - return - } + guard item.parent === notification.userInfo?["NSObject"] as? CEWorkspaceFile else { return } /// select active file under collapsed folder only if its parent is expanding if outlineView.isItemExpanded(item.parent) { updateSelection(itemID: item.id)