gitextensions#5665 override CommitInfo.OnLayout instead of Layout event subscription

Author: NikolayXHD

GitUI/CommitInfo/CommitInfo.Designer.cs

@@ -120,8 +120,6 @@ IDisposable subscribeToContentsResized(RichTextBox richTextBox, Action<ContentsR
                     .Throttle(TimeSpan.FromMilliseconds(100))
                     .ObserveOn(MainThreadScheduler.Instance)
                     .Subscribe(_ => handler(_.EventArgs));
-
-            Layout += layout;
         }
 
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
@@ -480,11 +478,9 @@ private void UpdateRevisionInfo()
                 new[] { _annotatedTagsInfo, _linksInfo, _branchInfo, _tagInfo, _gitDescribeInfo }
                     .Where(_ => !string.IsNullOrEmpty(_)));
 
-            RevisionInfo.SuspendLayout();
             RevisionInfo.SetXHTMLText(body);
             RevisionInfo.SelectionStart = 0; // scroll up
             RevisionInfo.ScrollToCaret();    // scroll up
-            RevisionInfo.ResumeLayout();
 
             return;
 
@@ -655,7 +651,7 @@ private void CommitMessage_ContentsResized(ContentsResizedEventArgs e)
             PerformLayout();
         }
 
-        private void layout(object sender, LayoutEventArgs e)
+        protected override void OnLayout(LayoutEventArgs e)
         {
             tableLayout.SuspendLayout();
 
@@ -680,16 +676,12 @@ private void layout(object sender, LayoutEventArgs e)
             column.SizeType = SizeType.Absolute;
             column.Width = width;
 
-            pnlCommitMessage.Size = new Size(width - pnlCommitMessage.Margin.Horizontal, _commitMessageHeight + rtbxCommitMessage.Margin.Vertical);
-            RevisionInfo.Size = new Size(width - RevisionInfo.Margin.Horizontal, _revisionInfoHeight);
-
             tableLayout.Size = new Size(width, heights.Sum());
 
             tableLayout.ResumeLayout(false);
             tableLayout.PerformLayout();
 
-            rtbxCommitMessage.Refresh();
-            RevisionInfo.Refresh();
+            base.OnLayout(e);
         }
 
         private void RichTextBox_KeyDown(object sender, KeyEventArgs e)

GitUI/CommitInfo/CommitInfo.cs

@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.Windows.Forms;
 using GitCommands;
 using GitUI;
 
@@ -15,31 +16,25 @@ internal sealed class GitExtensionsControlInitialiser
         public GitExtensionsControlInitialiser(GitExtensionsFormBase form)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
-            form.Font = AppSettings.Font;
-            form.Load += delegate
-            {
-                if (!_initialiseCompleteCalled && !IsDesignModeActive)
-                {
-                    throw new Exception($"{form.GetType().Name} must call {nameof(InitializeComplete)} in its constructor, ideally as the final statement.");
-                }
-            };
+            form.Load += LoadHandler;
             _translate = form;
         }
 
         public GitExtensionsControlInitialiser(GitExtensionsControl control)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
-            control.Font = AppSettings.Font;
-            control.Load += delegate
-            {
-                if (!_initialiseCompleteCalled && !IsDesignModeActive)
-                {
-                    throw new Exception($"{control.GetType().Name} must call {nameof(InitializeComplete)} in its constructor, ideally as the final statement.");
-                }
-            };
+            control.Load += LoadHandler;
             _translate = control;
         }
 
+        private void LoadHandler(object control, EventArgs e)
+        {
+            if (!_initialiseCompleteCalled && !IsDesignModeActive)
+            {
+                throw new Exception($"{control.GetType().Name} must call {nameof(InitializeComplete)} in its constructor, ideally as the final statement.");
+            }
+        }
+
         /// <summary>Indicates whether code is running as part of an IDE designer, such as the WinForms designer.</summary>
         public bool IsDesignModeActive => LicenseManager.UsageMode == LicenseUsageMode.Designtime;
 
@@ -51,6 +46,8 @@ public void InitializeComplete()
             }
 
             _initialiseCompleteCalled = true;
+
+            ((Control)_translate).Font = AppSettings.Font;
             Translator.Translate(_translate, AppSettings.CurrentTranslation);
         }
     }