Skip to content
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.

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

Debug area tabs #1261

Merged
merged 22 commits into from
Jun 4, 2023
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a527710
Initial Debugger drawer changes
bombardier200 May 8, 2023
0adbc4d
Fixing linting errors
bombardier200 May 8, 2023
bd2c4a7
Adding comments and more changes
bombardier200 May 8, 2023
c34f55d
Moved add and remove buttons into safe area insets of list
austincondiff May 10, 2023
edbcbec
Merged lastest
austincondiff May 10, 2023
ae4c976
Set holding priority on sidebars and debug area drawer
austincondiff May 16, 2023
01307fc
Fixed expanding animation on inspector sidebar, debug drawer, and deb…
austincondiff May 22, 2023
500f9bc
Merged lastest
austincondiff May 22, 2023
c3a026a
Updated CodeEditTextView reference to latest version
austincondiff May 22, 2023
8e0b3a6
Added icon tabs to the left of the debug area. Added sidebar to termi…
austincondiff May 25, 2023
ed6dd0e
Added functionality to rename and drag to reorder along with context …
austincondiff May 26, 2023
0f99f91
Adding terminalType selector
bombardier200 May 26, 2023
5ea6260
Fix SwiftLint error
bombardier200 May 26, 2023
9d3cfcf
Added terminal tab picker when sidebar is collapsed.
austincondiff May 26, 2023
80f2e6e
Renamed StatusbarViewModel to DebugAreaViewModel. Enabled multi-selec…
austincondiff May 29, 2023
e3e4976
Fixed build error
austincondiff May 29, 2023
4cec1aa
Changed the title until we can get the updated terminal title
austincondiff May 29, 2023
924a19f
Added DebugAreaTabView to simplify each of our debug area tab views.
austincondiff May 31, 2023
98013a2
Merged with main. Extensions now output to output debug area tab. Ena…
austincondiff May 31, 2023
ba09a97
Minor fixes
austincondiff Jun 1, 2023
1b153ba
Combined area tab bar views into single reusable view (#1289)
austincondiff Jun 2, 2023
da93714
Better fix for debug model updates to view
Wouter01 Jun 3, 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
Prev Previous commit
Better fix for debug model updates to view
Signed-off-by: Wouter01 <wouterhennen@gmail.com>
Wouter01 committed Jun 3, 2023
commit da937146e466f12a8cb618cb2af1e2fadde63d37
Original file line number Diff line number Diff line change
@@ -106,6 +106,7 @@ final class CodeEditWindowController: NSWindowController, NSToolbarDelegate, Obs
WorkspaceView()
.environmentObject(workspace)
.environmentObject(workspace.tabManager)
.environmentObject(workspace.debugAreaModel)
}
}

9 changes: 0 additions & 9 deletions CodeEdit/Features/Documents/WorkspaceDocument.swift
Original file line number Diff line number Diff line change
@@ -39,15 +39,6 @@ import Combine
var commandsPaletteState: CommandPaletteViewModel?
var listenerModel: WorkspaceNotificationModel = .init()

var anyCancellable: AnyCancellable?

override init() {
super.init()
anyCancellable = debugAreaModel.objectWillChange.sink { (_) in
self.objectWillChange.send()
}
}

private var cancellables = Set<AnyCancellable>()
private let openTabsStateName: String = "\(String(describing: WorkspaceDocument.self))-OpenTabs"
private let activeTabStateName: String = "\(String(describing: WorkspaceDocument.self))-ActiveTab"
8 changes: 5 additions & 3 deletions CodeEdit/WorkspaceView.swift
Original file line number Diff line number Diff line change
@@ -19,6 +19,9 @@ struct WorkspaceView: View {
@EnvironmentObject
private var tabManager: TabManager

@EnvironmentObject
private var debugAreaModel: DebugAreaViewModel

@Environment(\.window)
private var window

@@ -46,7 +49,7 @@ struct WorkspaceView: View {
SplitView(axis: .vertical) {
EditorView(tabgroup: tabManager.tabGroups, focus: $focusedEditor)
.collapsable()
.collapsed($workspace.debugAreaModel.isMaximized)
.collapsed($debugAreaModel.isMaximized)
.frame(minHeight: 170 + 29 + 29)
.frame(maxWidth: .infinity, maxHeight: .infinity)
.holdingPriority(.init(1))
@@ -55,12 +58,11 @@ struct WorkspaceView: View {
}
DebugAreaView()
.collapsable()
.collapsed($workspace.debugAreaModel.isCollapsed)
.collapsed($debugAreaModel.isCollapsed)
.frame(idealHeight: 260)
.frame(minHeight: 100)
}
.edgesIgnoringSafeArea(.top)
.environmentObject(workspace.debugAreaModel)
.frame(maxWidth: .infinity, maxHeight: .infinity)
.onChange(of: focusedEditor) { newValue in
if let newValue {