Add borders in Commit Form and set splitter width like in VS

gitextensions · Feb 18, 2021 · 983b0c3 · 983b0c3
1 parent 424ccf2
commit 983b0c3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/GitExtUtils/GitUI/ControlDpiExtensions.cs b/GitExtUtils/GitUI/ControlDpiExtensions.cs
@@ -70,7 +70,7 @@ public static void AdjustForDpiScaling(this Control control)
 
                     case SplitContainer splitContainer:
                     {
-                        const int splitterWidth = 8;
+                        const int splitterWidth = 6;
 
                         if (!isDpiScaled)
                         {

diff --git a/GitUI/CommandsDialogs/FormBrowse.Designer.cs b/GitUI/CommandsDialogs/FormBrowse.Designer.cs
diff --git a/GitUI/CommandsDialogs/FormCommit.Designer.cs b/GitUI/CommandsDialogs/FormCommit.Designer.cs
diff --git a/GitUI/CommandsDialogs/FormCommit.cs b/GitUI/CommandsDialogs/FormCommit.cs
@@ -318,6 +318,13 @@ public FormCommit([NotNull] GitUICommands commands, CommitKind commitKind = Comm
 
             toolStripStatusBranchIcon.AdaptImageLightness();
 
+            splitLeft.Panel1.BackColor = Color.LightGray.AdaptBackColor();
+            splitLeft.Panel2.BackColor = Color.LightGray.AdaptBackColor();
+            splitRight.Panel1.BackColor = Color.LightGray.AdaptBackColor();
+            splitRight.Panel2.BackColor = Color.LightGray.AdaptBackColor();
+
+            WorkaroundPaddingIncreaseBug();
+
             InitializeComplete();
 
             // By calling this in the constructor, we prevent flickering caused by resizing the
@@ -380,6 +387,14 @@ void ConfigureMessageBox()
                     ? _enterCommitMessageHint.Text
                     : _commitMessageDisabled.Text;
             }
+
+            void WorkaroundPaddingIncreaseBug()
+            {
+                splitLeft.Panel1.Padding = new Padding(1);
+                splitLeft.Panel2.Padding = new Padding(1);
+                splitRight.Panel1.Padding = new Padding(1);
+                splitRight.Panel2.Padding = new Padding(1);
+            }
         }
 
         protected override void Dispose(bool disposing)