From b3eaa5870b5c3ac085127d650a2958ea5f7db800 Mon Sep 17 00:00:00 2001
From: RussKie <russkie@gmail.com>
Date: Thu, 4 Feb 2021 22:37:49 +1100
Subject: [PATCH] Correct padding increase

#8557 introduced new margins and borders, however those margins
and borders are not correctly calculated in scaled environments, i.e.
scale factor >100%.

#8732 is probably a more "correct" fix, however this is a smaller more
targeted fix.

Resolves #8698
Closes #8732
---
 GitUI/CommandsDialogs/FormBrowse.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/GitUI/CommandsDialogs/FormBrowse.cs b/GitUI/CommandsDialogs/FormBrowse.cs
index 9975f223432..6061bdff2c5 100644
--- a/GitUI/CommandsDialogs/FormBrowse.cs
+++ b/GitUI/CommandsDialogs/FormBrowse.cs
@@ -279,6 +279,7 @@ public FormBrowse([NotNull] GitUICommands commands, string filter, ObjectId sele
             ManageWorktreeSupport();
 
             WorkaroundToolbarLocationBug();
+            WorkaroundPaddingIncreaseBug();
 
             var toolBackColor = SystemColors.Window;
             var toolForeColor = SystemColors.WindowText;
@@ -531,6 +532,13 @@ void WorkaroundToolbarLocationBug()
                 }
 #endif
             }
+
+            void WorkaroundPaddingIncreaseBug()
+            {
+                MainSplitContainer.Panel1.Padding = new Padding(1);
+                RevisionsSplitContainer.Panel1.Padding = new Padding(1);
+                RevisionsSplitContainer.Panel2.Padding = new Padding(1);
+            }
         }
 
         private void FillNextPullActionAsDefaultToolStripMenuItems()