From b1b6e9a2a16670c3d1d68d07ae52872b934c4306 Mon Sep 17 00:00:00 2001
From: Gregory John Casamento <greg.casamento@gmail.com>
Date: Fri, 26 Mar 2021 18:08:30 -0400
Subject: [PATCH] Add padding back into calculation

---
 Source/NSGridView.m | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Source/NSGridView.m b/Source/NSGridView.m
index 9df14d84d..a3d97139c 100644
--- a/Source/NSGridView.m
+++ b/Source/NSGridView.m
@@ -196,7 +196,7 @@
           
           if (ci == 0)
             {
-              // current_y -= [row topPadding];
+              current_y -= [row topPadding];
               current_y -= p.size.height;
               current_x = 0.0;
             }
@@ -210,8 +210,15 @@
               [v setFrame: rect];
               [self addSubview: v];
             }
-           
+
+          current_x += [col leadingPadding];
           current_x += p.size.width;
+          current_x += [col trailingPadding];
+
+          if (ci == 0)
+            {
+              current_y -= [row bottomPadding];
+            }
           
           // inc
           i++;