Skip to content

Fix Inspector toggling #1192

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
Wouter01 merged 4 commits into from
Mar 23, 2023
Merged

Fix Inspector toggling #1192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24b8e48
Fixed inspector not toggling
Wouter01 Mar 23, 2023
b155c1e
Removed old sidebar command
Wouter01 Mar 23, 2023
ed2741f
Fix warning
Wouter01 Mar 23, 2023
352e9c3
fix warning
Wouter01 Mar 23, 2023
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
22 changes: 19 additions & 3 deletions CodeEdit/Features/Documents/Controllers/CodeEditWindowController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,21 @@
import Cocoa
import SwiftUI

final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, ObservableObject {
static let minSidebarWidth: CGFloat = 242

@Published var navigatorCollapsed = false
@Published var inspectorCollapsed = false

var observers: [NSKeyValueObservation] = []

private var prefs: AppPreferencesModel = .shared

var workspace: WorkspaceDocument?
var quickOpenPanel: OverlayPanel?
var commandPalettePanel: OverlayPanel?

private var splitViewController: NSSplitViewController!
var splitViewController: NSSplitViewController!

init(window: NSWindow, workspace: WorkspaceDocument) {
super.init(window: window)
Expand All @@ -31,6 +36,15 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
// This allows us to use some SwiftUI features, like focusedSceneObject.
contentViewController = NSHostingController(rootView: view)

observers = [
splitViewController.splitViewItems.first!.observe(\.isCollapsed, changeHandler: { [weak self] item, _ in
self?.navigatorCollapsed = item.isCollapsed
}),
splitViewController.splitViewItems.last!.observe(\.isCollapsed, changeHandler: { [weak self] item, _ in
self?.navigatorCollapsed = item.isCollapsed
})
]

setupToolbar()
registerCommands()
}
Expand Down Expand Up @@ -298,7 +312,9 @@ extension CodeEditWindowController {
func toggleLastPanel() {
guard let lastSplitView = splitViewController.splitViewItems.last else { return }

if lastSplitView.isCollapsed {
if let toolbar = window?.toolbar,
lastSplitView.isCollapsed,
!toolbar.items.map(\.itemIdentifier).contains(.itemListTrackingSeparator) {
window?.toolbar?.insertItem(withItemIdentifier: .itemListTrackingSeparator, at: 4)
}
NSAnimationContext.runAnimationGroup { _ in
Expand Down
1 change: 0 additions & 1 deletion CodeEdit/Features/WindowCommands/CodeEditCommands.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ struct CodeEditCommands: Commands {
var body: some Commands {
MainCommands()
FileCommands()
SidebarCommands()
ViewCommands()
FindCommands()
NavigateCommands()
Expand Down
26 changes: 26 additions & 0 deletions CodeEdit/Features/WindowCommands/ViewCommands.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ import SwiftUI

struct ViewCommands: Commands {
private var prefs: AppPreferencesModel = .shared
@State var windowController: CodeEditWindowController?

var navigatorCollapsed: Bool {
windowController?.navigatorCollapsed ?? false
}

var inspectorCollapsed: Bool {
windowController?.navigatorCollapsed ?? false
}

var body: some Commands {
CommandGroup(after: .toolbar) {
Expand All @@ -33,6 +42,23 @@ struct ViewCommands: Commands {

}
.disabled(true)

Divider()

Button("\(navigatorCollapsed ? "Show" : "Hide") Navigator") {
windowController?.toggleFirstPanel()
}
.disabled(windowController == nil)
.keyboardShortcut("s", modifiers: [.control, .command])
.onReceive(NSApp.publisher(for: \.keyWindow)) { window in
windowController = window?.windowController as? CodeEditWindowController
}

Button("\(inspectorCollapsed ? "Show" : "Hide") Inspector") {
windowController?.toggleLastPanel()
}
.disabled(windowController == nil)
.keyboardShortcut("i", modifiers: [.control, .command])
}
}
}