Skip to content

fix(datagrid): value-filter popover value font and row alignment #2580

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

Open
shreeve wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −2
Open

fix(datagrid): value-filter popover value font and row alignment #2580

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- MongoDB `.sort()` and `.projection()` silently ignored when written with unquoted keys.
- Compare & Sync unable to drop an overloaded PostgreSQL routine, or any trigger.
- PostgreSQL sequence DDL naming the schema it was read from, in SQL export and the structure editor.
- Value-filter popover listing values in the system font, with rows indented differently than Select All.

## [0.69.0] - 2026-08-27

Expand Down
9 changes: 7 additions & 2 deletions TablePro/Views/Results/ColumnValueFilterPopover.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ struct ColumnValueFilterPopover: View {

private static let nullLabel = String(localized: "(NULL)")
private static let emptyLabel = String(localized: "(Empty)")
private static let horizontalInset: CGFloat = 14

init(
columnName: String,
Expand Down Expand Up @@ -65,7 +66,7 @@ struct ColumnValueFilterPopover: View {
.foregroundStyle(.secondary)
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.horizontal, 14)
.padding(.horizontal, Self.horizontalInset)
.padding(.top, 12)
.padding(.bottom, 8)
}
Expand All @@ -89,7 +90,7 @@ struct ColumnValueFilterPopover: View {
Spacer()
}
}
.padding(.horizontal, 14)
.padding(.horizontal, Self.horizontalInset)
.padding(.vertical, 8)
}

Expand All @@ -99,6 +100,7 @@ struct ColumnValueFilterPopover: View {
Toggle(isOn: binding(for: value)) {
HStack(spacing: 8) {
Text(label(for: value))
.font(ThemeEngine.shared.valueFontSwiftUI)
.lineLimit(1)
.truncationMode(.tail)
.foregroundStyle(value.isNull ? Color.secondary : Color.primary)
Expand All @@ -109,6 +111,9 @@ struct ColumnValueFilterPopover: View {
}
}
.toggleStyle(.checkbox)
.listRowInsets(EdgeInsets(
top: 2, leading: Self.horizontalInset, bottom: 2, trailing: Self.horizontalInset
))
}
}
.listStyle(.plain)
Expand Down
1 change: 1 addition & 0 deletions TableProTests/Theme/ValueFontTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ struct ValueFontTests {
"TablePro/Views/RightSidebar/FieldEditors/SetPickerView.swift",
"TablePro/Views/Results/CellOverlayEditor.swift",
"TablePro/Views/Results/CellOverlayViewer.swift",
"TablePro/Views/Results/ColumnValueFilterPopover.swift",
"TablePro/Views/Results/TextViewerWindowController.swift",
"TablePro/Views/Results/HexEditorContentView.swift",
"TablePro/Views/Results/ForeignKeyPreviewView.swift",
Expand Down