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.

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

Jump to bottom

Make toggling utility area maximization smooth #1701

Closed
wants to merge 3 commits into from
Closed

Make toggling utility area maximization smooth #1701

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebde4d9
Actually use Status Bar buttons
danielzsh May 3, 2024
eca4456
Make maximize animation smooth
danielzsh May 3, 2024
a6cc55a
Prioritize utility area in layout
danielzsh May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 2 additions & 10 deletions CodeEdit/Features/UtilityArea/TerminalUtility/UtilityAreaTerminalView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,16 +155,8 @@ struct UtilityAreaTerminalView: View {
}
Spacer()
PaneToolbarSection {
Button {
// clear logs
} label: {
Image(systemName: "trash")
}
Button {
// split terminal
} label: {
Image(systemName: "square.split.2x1")
}
StatusBarClearButton()
StatusBarSplitTerminalButton()
}
}
.background {
Expand Down
1 change: 0 additions & 1 deletion CodeEdit/Features/UtilityArea/Toolbar/StatusBarClearButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ struct StatusBarClearButton: View {
Image(systemName: "trash")
.foregroundColor(.secondary)
}
.buttonStyle(.plain)
}
}
2 changes: 1 addition & 1 deletion CodeEdit/Features/UtilityArea/Toolbar/StatusBarMaximizeButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ struct StatusBarMaximizeButton: View {
Image(systemName: "arrowtriangle.up.square")
.foregroundColor(model.isMaximized ? .accentColor : .secondary)
}
.buttonStyle(.plain)
.buttonStyle(.icon(isActive: model.isMaximized, size: 24))
}
}
2 changes: 0 additions & 2 deletions CodeEdit/Features/UtilityArea/Toolbar/StatusBarSplitTerminalButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ struct StatusBarSplitTerminalButton: View {
// todo
} label: {
Image(systemName: "square.split.2x1")
.foregroundColor(.secondary)
}
.buttonStyle(.plain)
}
}
7 changes: 1 addition & 6 deletions CodeEdit/Features/UtilityArea/Views/UtilityAreaView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,7 @@ struct UtilityAreaView: View {
HStack(spacing: 5) {
Divider()
HStack(spacing: 0) {
Button {
model.isMaximized.toggle()
} label: {
Image(systemName: "arrowtriangle.up.square")
}
.buttonStyle(.icon(isActive: model.isMaximized, size: 24))
StatusBarMaximizeButton()
}
}
.colorScheme(
Expand Down
1 change: 0 additions & 1 deletion CodeEdit/WorkspaceView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ struct WorkspaceView: View {
.collapsed($utilityAreaModel.isMaximized)
.frame(minHeight: 170 + 29 + 29)
.frame(maxWidth: .infinity, maxHeight: .infinity)
.holdingPriority(.init(1))
.safeAreaInset(edge: .bottom, spacing: 0) {
StatusBarView(proxy: proxy)
}
Expand Down