Skip to content

fix: sidebar gap when switching between table and query tabs (#759) #761

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
datlechin wants to merge 1 commit into from
+16 −12
Closed

fix: sidebar gap when switching between table and query tabs (#759) #761

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 16 additions & 12 deletions TablePro/Views/Toolbar/TableProToolbarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,19 +162,23 @@ struct TableProToolbar: ViewModifier {
}
}

if !state.isTableTab {
ToolbarItem(placement: .primaryAction) {
Button { actions?.toggleResults() } label: {
Label(
"Results",
systemImage: state.isResultsCollapsed
? "rectangle.bottomhalf.inset.filled"
: "rectangle.inset.filled"
)
}
.help(String(localized: "Toggle Results (⌘⌥R)"))
.disabled(state.connectionState != .connected)
// Always include this ToolbarItem to keep the toolbar layout
// stable across tab types. Conditionally adding/removing
// ToolbarItems causes NavigationSplitView to recalculate the
// sidebar's top safe-area inset, producing a visible gap (#759).
ToolbarItem(placement: .primaryAction) {
Button { actions?.toggleResults() } label: {
Label(
"Results",
systemImage: state.isResultsCollapsed
? "rectangle.bottomhalf.inset.filled"
: "rectangle.inset.filled"
)
}
.help(String(localized: "Toggle Results (⌘⌥R)"))
.disabled(state.connectionState != .connected)
.opacity(state.isTableTab ? 0 : 1)
.allowsHitTesting(!state.isTableTab)
}

ToolbarItem(placement: .primaryAction) {
Expand Down
Loading