Fix feature card grid so partial rows match top-row sizing and alignment.

Use a fixed-column grid with spacers instead of separate row stacks that stretched bottom cards to full width.

Co-authored-by: Cursor <cursoragent@cursor.com>

smart_printer/AppTheme.swift

@@ -10,6 +10,7 @@ enum AppTheme {
     static let contentPadding: CGFloat = 20
     static let quickStartSpacing: CGFloat = 12
     static let featureGridSpacing: CGFloat = 10
+    static let featureGridColumns = 3
 
     static let quickStartIconMax: CGFloat = 80
     static let quickStartIconMin: CGFloat = 56

smart_printer/ViewController.swift

@@ -199,7 +199,7 @@ class ViewController: NSViewController {
         documentView.translatesAutoresizingMaskIntoConstraints = false
 
         let sectionTitle = makeSectionTitle(title, icon: .grid)
-        let grid = makeFeatureRow(features: features)
+        let grid = makeFeatureGrid(features: features, columns: AppTheme.featureGridColumns)
 
         documentView.addSubview(sectionTitle)
         documentView.addSubview(grid)
@@ -436,19 +436,12 @@ class ViewController: NSViewController {
             FeatureCardData(title: "Scan File", subtitle: "Scan any document", iconKind: .scanFile),
             FeatureCardData(title: "Print Text", subtitle: "Type text and print", iconKind: .printText),
             FeatureCardData(title: "Print Contacts", subtitle: "Print your contacts", iconKind: .printContacts),
-            FeatureCardData(title: "Print Website", subtitle: "Print any website", iconKind: .printWebsite),
             FeatureCardData(title: "Draw & Print", subtitle: "Add drawings, text and more", iconKind: .drawPrint),
             FeatureCardData(title: "OCR File", subtitle: "Scan and print text from images", iconKind: .ocrFile),
+            FeatureCardData(title: "Print Website", subtitle: "Print any website", iconKind: .printWebsite),
         ]
 
-        let topRow = makeFeatureRow(features: Array(features.prefix(4)))
-        let bottomRow = makeFeatureRow(features: Array(features.suffix(2)))
-
-        let grid = NSStackView(views: [topRow, bottomRow])
-        grid.orientation = .vertical
-        grid.spacing = AppTheme.featureGridSpacing
-        grid.distribution = .fillEqually
-        grid.translatesAutoresizingMaskIntoConstraints = false
+        let grid = makeFeatureGrid(features: features, columns: AppTheme.featureGridColumns)
 
         section.addSubview(grid)
 
@@ -465,18 +458,40 @@ class ViewController: NSViewController {
         return section
     }
 
-    private func makeFeatureRow(features: [FeatureCardData]) -> NSStackView {
-        let row = NSStackView()
-        row.orientation = .horizontal
-        row.spacing = AppTheme.featureGridSpacing
-        row.distribution = .fillEqually
-        row.translatesAutoresizingMaskIntoConstraints = false
+    private func makeFeatureGrid(features: [FeatureCardData], columns: Int) -> NSView {
+        let grid = NSStackView()
+        grid.orientation = .vertical
+        grid.spacing = AppTheme.featureGridSpacing
+        grid.distribution = .fill
+        grid.alignment = .leading
+        grid.translatesAutoresizingMaskIntoConstraints = false
+
+        var index = 0
+        while index < features.count {
+            let row = NSStackView()
+            row.orientation = .horizontal
+            row.spacing = AppTheme.featureGridSpacing
+            row.distribution = .fillEqually
+            row.translatesAutoresizingMaskIntoConstraints = false
+
+            let rowCount = min(columns, features.count - index)
+            for offset in 0..<rowCount {
+                row.addArrangedSubview(FeatureCardView(data: features[index + offset]))
+            }
+            for _ in 0..<(columns - rowCount) {
+                let spacer = NSView()
+                spacer.setContentHuggingPriority(.defaultLow, for: .horizontal)
+                spacer.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+                row.addArrangedSubview(spacer)
+            }
 
-        for data in features {
-            row.addArrangedSubview(FeatureCardView(data: data))
+            grid.addArrangedSubview(row)
+            row.leadingAnchor.constraint(equalTo: grid.leadingAnchor).isActive = true
+            row.trailingAnchor.constraint(equalTo: grid.trailingAnchor).isActive = true
+            index += rowCount
         }
 
-        return row
+        return grid
     }
 }