Browse Source

fix for tab ever increasing height on language change - upstream

deadmoon 1 year ago
parent
commit
6d9bc1c257
2 changed files with 6 additions and 9 deletions
  1. 1 1
      Optimizer/Controls/ColorPicker.cs
  2. 5 8
      Optimizer/Forms/MainForm.cs

+ 1 - 1
Optimizer/Controls/ColorPicker.cs

@@ -9,7 +9,7 @@ namespace Optimizer.Controls
 {
     [DefaultProperty("Color")]
     [DefaultEvent("ColorChanged")]
-    public sealed partial class ColorPicker : Control
+    public partial class ColorPicker : Control
     {
         #region Fields
 

+ 5 - 8
Optimizer/Forms/MainForm.cs

@@ -1079,18 +1079,15 @@ namespace Optimizer
         private void FixTabHeaderWidth()
         {
             if (tabCollection.ItemSize == new Size(0, 0)) return;
-
-            int maxTextWidth = 0;
+            int maxTextWidth = 0, maxTextHeight = 0;
             for (int i = 0; i < tabCollection.TabPages.Count; i++)
             {
                 var tabWidth = TextRenderer.MeasureText(tabCollection.TabPages[i]?.Text, tabCollection.TabPages[i]?.Font).Width;
-                if (tabWidth > maxTextWidth)
-                {
-                    maxTextWidth = tabWidth;
-                }
+                var tabHeight = TextRenderer.MeasureText(tabCollection.TabPages[i]?.Text, tabCollection.TabPages[i]?.Font).Height;
+                if (tabWidth > maxTextWidth) maxTextWidth = tabWidth;
+                if (tabHeight > maxTextHeight) maxTextHeight = tabHeight;
             }
-
-            tabCollection.ItemSize = new Size(maxTextWidth, tabCollection.ItemSize.Height + _tabHeaderHeightMargin);
+            tabCollection.ItemSize = new Size(maxTextWidth, maxTextHeight + _tabHeaderHeightMargin);
         }
 
         private void LoadReadyMenusState()