Skip to content

File Icon Type setting reflects immediately #1765 #1773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tom-ludwig merged 4 commits into from
Jun 23, 2024
Merged

File Icon Type setting reflects immediately #1765 #1773

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41b80d4
File Icon Type setting reflects immediately #1765
hkarmoush Jun 22, 2024
7d43332
Merge branch 'main'
hkarmoush Jun 22, 2024
a1ca100
Merge branch 'main' into pr/1773
tom-ludwig Jun 23, 2024
25d8d76
:rotating_light: swiftlint
tom-ludwig Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .../Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -275,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

Expand All @@ -298,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)
Expand Down