Skip to content

Add holding priority view modifier #1265

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

Merged
merged 1 commit into from
May 10, 2023
Merged
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CodeEdit/Features/SplitView/SplitViewItem.swift
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ class SplitViewItem: ObservableObject {
self.collapsed = child[SplitViewItemCollapsedViewTraitKey.self]
self.item.canCollapse = child[SplitViewItemCanCollapseViewTraitKey.self]
self.item.isCollapsed = self.collapsed.wrappedValue
self.item.holdingPriority = child[SplitViewHoldingPriorityTraitKey.self]
self.observers = createObservers()
}

@@ -44,6 +45,7 @@ class SplitViewItem: ObservableObject {
DispatchQueue.main.async {
self.observers = []
self.item.animator().isCollapsed = child[SplitViewItemCollapsedViewTraitKey.self].wrappedValue
self.item.holdingPriority = child[SplitViewHoldingPriorityTraitKey.self]
self.observers = self.createObservers()
}
}
9 changes: 9 additions & 0 deletions CodeEdit/Features/SplitView/SplitViewModifiers.swift
Original file line number Diff line number Diff line change
@@ -19,6 +19,10 @@ struct SplitViewItemCanCollapseViewTraitKey: _ViewTraitKey {
static var defaultValue: Bool = false
}

struct SplitViewHoldingPriorityTraitKey: _ViewTraitKey {
static var defaultValue: NSLayoutConstraint.Priority = .defaultLow
}

extension View {
func collapsed(_ value: Binding<Bool>) -> some View {
self
@@ -34,4 +38,9 @@ extension View {
self
._trait(SplitViewItemCanCollapseViewTraitKey.self, true)
}

func holdingPriority(_ priority: NSLayoutConstraint.Priority) -> some View {
self
._trait(SplitViewHoldingPriorityTraitKey.self, priority)
}
}
2 changes: 2 additions & 0 deletions CodeEdit/WorkspaceView.swift
Original file line number Diff line number Diff line change
@@ -44,13 +44,15 @@ struct WorkspaceView: View {

EditorView(tabgroup: tabManager.tabGroups, focus: $focusedEditor)
.frame(maxWidth: .infinity, maxHeight: .infinity)
.holdingPriority(.init(10))
.safeAreaInset(edge: .bottom, spacing: 0) {
StatusBarView(proxy: proxy, collapsed: $terminalCollapsed)
}

StatusBarDrawer()
.collapsable()
.collapsed($terminalCollapsed)
.holdingPriority(.init(20))
.frame(minHeight: 200, maxHeight: 400)

}