Skip to content

Utility area show/hide animates with push/pull rather than revealing #1778

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

Closed
FastestMolasses wants to merge 2 commits into from
Closed

Utility area show/hide animates with push/pull rather than revealing #1778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
933615a
Add animating offset to utility area when collapsing
FastestMolasses Jun 25, 2024
f84cbf9
Remove unneeded animation
FastestMolasses Jun 25, 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
4 changes: 1 addition & 3 deletions CodeEdit/Features/UtilityArea/ViewModels/UtilityAreaViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ class UtilityAreaViewModel: ObservableObject {
}

func togglePanel() {
withAnimation {
self.isCollapsed.toggle()
}
self.isCollapsed.toggle()
}
}
29 changes: 17 additions & 12 deletions CodeEdit/Features/UtilityArea/Views/UtilityAreaView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,26 @@ struct UtilityAreaView: View {
@State var selection: UtilityAreaTab? = .terminal

var body: some View {
VStack(spacing: 0) {
if let selection {
selection
} else {
Text("Tab not found")
.frame(maxWidth: .infinity, maxHeight: .infinity)
GeometryReader { geometry in
VStack(spacing: 0) {
if let selection {
selection
} else {
Text("Tab not found")
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
}
}
.safeAreaInset(edge: .leading, spacing: 0) {
HStack(spacing: 0) {
AreaTabBar(items: $utilityAreaViewModel.tabItems, selection: $selection, position: .side)
Divider()
.overlay(Color(nsColor: colorScheme == .dark ? .black : .clear))
.offset(y: utilityAreaViewModel.isCollapsed ? geometry.size.height : 0)
.safeAreaInset(edge: .leading, spacing: 0) {
HStack(spacing: 0) {
AreaTabBar(items: $utilityAreaViewModel.tabItems, selection: $selection, position: .side)
.offset(y: utilityAreaViewModel.isCollapsed ? geometry.size.height : 0)
Divider()
.overlay(Color(nsColor: colorScheme == .dark ? .black : .clear))
}
}
}
.animation(.snappy, value: utilityAreaViewModel.isCollapsed)
.overlay(alignment: .bottomTrailing) {
HStack(spacing: 5) {
Divider()
Expand Down