diff --git a/CHANGELOG.md b/CHANGELOG.md index c289662c0..99cd5e69f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/TablePro/Views/Results/ColumnValueFilterPopover.swift b/TablePro/Views/Results/ColumnValueFilterPopover.swift index f08d51bf1..97c3d7da3 100644 --- a/TablePro/Views/Results/ColumnValueFilterPopover.swift +++ b/TablePro/Views/Results/ColumnValueFilterPopover.swift @@ -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, @@ -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) } @@ -89,7 +90,7 @@ struct ColumnValueFilterPopover: View { Spacer() } } - .padding(.horizontal, 14) + .padding(.horizontal, Self.horizontalInset) .padding(.vertical, 8) } @@ -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) @@ -109,6 +111,9 @@ struct ColumnValueFilterPopover: View { } } .toggleStyle(.checkbox) + .listRowInsets(EdgeInsets( + top: 2, leading: Self.horizontalInset, bottom: 2, trailing: Self.horizontalInset + )) } } .listStyle(.plain) diff --git a/TableProTests/Theme/ValueFontTests.swift b/TableProTests/Theme/ValueFontTests.swift index b390ed7bd..d27ab644c 100644 --- a/TableProTests/Theme/ValueFontTests.swift +++ b/TableProTests/Theme/ValueFontTests.swift @@ -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",